Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupMemberServiceImpl.java

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/OmsPortalOrderController.java

@@ -105,6 +105,15 @@ public class OmsPortalOrderController {
         return CommonResult.success(orderDetail);
     }
 
+
+    @ApiOperation("根据订单号获取订单详情")
+    @RequestMapping(value = "/detail/sn/{orderSn}", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<OmsOrderDetail> detail(@PathVariable String orderSn) {
+        OmsOrderDetail orderDetail = portalOrderService.detail(orderSn);
+        return CommonResult.success(orderDetail);
+    }
+
     @ApiOperation("用户取消订单")
     @RequestMapping(value = "/cancelUserOrder", method = RequestMethod.POST)
     @ResponseBody

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/OmsPortalOrderService.java

@@ -70,6 +70,8 @@ public interface OmsPortalOrderService {
      */
     OmsOrderDetail detail(Long orderId);
 
+    OmsOrderDetail detail(String orderSn);
+
     /**
      * 用户根据订单ID删除订单
      */

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -475,6 +475,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         return orderDetail;
     }
 
+    @Override
     public OmsOrderDetail detail(String orderSn) {
         OmsOrderExample orderExample = new OmsOrderExample();
         orderExample.createCriteria().andOrderSnEqualTo(orderSn);

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/PmsPortalProductServiceImpl.java

@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 前台订单管理Service实现类
@@ -63,7 +64,8 @@ public class PmsPortalProductServiceImpl implements PmsPortalProductService {
             criteria.andBrandIdEqualTo(brandId);
         }
         if (productCategoryId != null) {
-            criteria.andProductCategoryIdEqualTo(productCategoryId);
+            List<Long> productCategoryIds = getProductCategoryIds(productCategoryId);
+            criteria.andProductCategoryIdIn(productCategoryIds);
         }
         if (productAttributeCategoryId != null) {
             criteria.andProductAttributeCategoryIdEqualTo(productAttributeCategoryId);
@@ -95,6 +97,29 @@ public class PmsPortalProductServiceImpl implements PmsPortalProductService {
 
     }
 
+    /**
+     * 获取当前分类和下级分类 id
+     *
+     * @param productCategoryId
+     * @return
+     */
+    private List<Long> getProductCategoryIds(Long productCategoryId) {
+        PmsProductCategoryExample productCategoryExample = new PmsProductCategoryExample();
+        productCategoryExample.setOrderByClause("sort desc");
+        productCategoryExample.createCriteria().andParentIdEqualTo(productCategoryId)
+               .andShowStatusEqualTo(1);
+        List<PmsProductCategory> pmsProductCategories = productCategoryMapper.selectByExample(productCategoryExample);
+        List<Long> productCategoryIds = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(pmsProductCategories)) {
+            productCategoryIds = pmsProductCategories
+                    .stream()
+                    .map(PmsProductCategory::getId)
+                    .collect(Collectors.toList());
+        }
+        productCategoryIds.add(productCategoryId);
+        return productCategoryIds;
+    }
+
     @Override
     public List<PmsProductCategoryNode> categoryTreeList() {
         PmsProductCategoryExample example = new PmsProductCategoryExample();

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SysManualController.java

@@ -1,15 +1,13 @@
 package com.yonge.cooleshow.admin.controller;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.biz.dal.vo.SysManualVo;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
@@ -44,25 +42,24 @@ public class SysManualController extends BaseController {
 
     @ApiOperation(value = "查询操作手册")
     @RequestMapping("/list")
-    public HttpResponseResult<PageInfo<SysManualVo>> list( @RequestBody SysManualQueryInfo queryInfo) {
-        return succeed(PageUtil.pageInfo(sysManualService.query(PageUtil.getPage(queryInfo),queryInfo)));
+    public Object list(SysManualQueryInfo queryInfo) {
+        return succeed(sysManualService.query(queryInfo));
     }
 
     @ApiOperation(value = "新增帮助手册")
     @PostMapping("/add")
-    public HttpResponseResult<Boolean> add(@RequestBody SysManual sysManual) throws Exception {
+    public Object add(@RequestBody SysManual sysManual) throws Exception {
         this.check(sysManual);
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        sysManual.setStatus(YesOrNoEnum.NO);
         return succeed(sysManualService.add(sysManual, sysUser.getId()));
     }
 
     @ApiOperation(value = "修改帮助手册")
     @PostMapping("/update")
-    public  HttpResponseResult<Boolean>  update(@RequestBody SysManual sysManual) throws Exception {
+    public Object update(@RequestBody SysManual sysManual) throws Exception {
         this.check(sysManual);
         if (sysManual.getId() == null) {
             throw new Exception("更新必须有id");
@@ -71,7 +68,7 @@ public class SysManualController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        return succeed(sysManualService.update(sysManual, sysUser.getId()) >0);
+        return succeed(sysManualService.update(sysManual, sysUser.getId()));
     }
 
     private void check(SysManual sysManual) throws Exception {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysManualDao.java

@@ -1,15 +1,11 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.biz.dal.queryInfo.SysManualQueryInfo;
-import com.yonge.cooleshow.biz.dal.vo.SysManualVo;
-import org.apache.ibatis.annotations.Param;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.entity.SysManual;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * (SysManual)表数据库访问层
@@ -26,14 +22,5 @@ public interface SysManualDao extends BaseMapper<SysManual> {
     List<SysManual> queryRecord(Map<String, Object> params);
 
     List<String> listMenuIds();
-
-    /**
-     * 分页查询
-     *
-     * @param page      分页信息
-     * @param queryInfo 查询条件
-     * @return
-     */
-    IPage<SysManualVo> query(@Param("page") IPage<SysManualVo> page, @Param("param") SysManualQueryInfo queryInfo);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysManual.java

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * (SysManual)表实体类
@@ -31,11 +29,6 @@ public class SysManual implements Serializable {
     @TableField("name_")
     @ApiModelProperty(value = "手册名称")
     private String name;
-
-    @TableField("status_")
-    @ApiModelProperty(value = "状态 0：禁用 1：启用")
-    private YesOrNoEnum status;
-
     @TableField("op_flow_")
     @ApiModelProperty(value = "操作流程")
     private String opFlow;
@@ -161,12 +154,5 @@ public class SysManual implements Serializable {
     }
 
 
-    public YesOrNoEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(YesOrNoEnum status) {
-        this.status = status;
-    }
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/SysManualQueryInfo.java

@@ -1,9 +1,7 @@
 package com.yonge.cooleshow.biz.dal.queryInfo;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import io.swagger.annotations.ApiModelProperty;
-
 import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * Description
@@ -18,28 +16,6 @@ public class SysManualQueryInfo  extends QueryInfo {
     @ApiModelProperty(value = "按菜单查询")
     private Integer menuId;
 
-    @ApiModelProperty("标题")
-    private String title;
-
-    @ApiModelProperty(value = "状态 0：禁用 1：启用")
-    private YesOrNoEnum status;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public YesOrNoEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(YesOrNoEnum status) {
-        this.status = status;
-    }
-
     public Integer getMenuId() {
         return menuId;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysManualService.java

@@ -1,10 +1,8 @@
 package com.yonge.cooleshow.biz.dal.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.SysManual;
 import com.yonge.cooleshow.biz.dal.queryInfo.SysManualQueryInfo;
-import com.yonge.cooleshow.biz.dal.vo.SysManualVo;
 import com.yonge.toolset.base.page.PageInfo;
 
 /**
@@ -23,6 +21,5 @@ public interface SysManualService extends IService<SysManual> {
 
     String listMenuIds();
 
-     IPage<SysManualVo> query(IPage<SysManualVo> page, SysManualQueryInfo queryInfo);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -1052,19 +1052,19 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             teacherSalaryList.add(teacherSalary);
             teacherSalary.setCreateTime(now);
 
-            teacherId=payment.getTeacherId();
-            studentId=payment.getUserId();
+            teacherId = payment.getTeacherId();
+            studentId = payment.getUserId();
         }
         courseScheduleTeacherSalaryService.getDao().insertBatch(teacherSalaryList);
         log.info("buyPracticeCourseSuccess ok");
 
-        Set<Long> studentIds=new HashSet();
+        Set<Long> studentIds = new HashSet();
         studentIds.add(studentId);
         try {
-            imUserFriendService.saveUserFriend(teacherId,studentIds);
-            log.info("保存用户通讯录成功,teacherId:{},studentIds:{}",teacherId,studentIds);
-        }catch (Exception e){
-            log.error("保存用户通讯录失败,teacherId:{},studentIds:{},e:{}",teacherId,studentIds,e);
+            imUserFriendService.saveUserFriend(teacherId, studentIds);
+            log.info("保存用户通讯录成功,teacherId:{},studentIds:{}", teacherId, studentIds);
+        } catch (Exception e) {
+            log.error("保存用户通讯录失败,teacherId:{},studentIds:{},e:{}", teacherId, studentIds, e);
         }
 
         //消息推送
@@ -1882,6 +1882,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 imGroupService.dismiss(String.valueOf(groupId));
             } catch (Exception e) {
                 log.error("琴房课程组id:{},关闭群聊失败:{}", groupId, e);
+                throw new BizException("关闭群聊失败");
             }
         } else {
             courseGroupService.update(null, Wrappers.<CourseGroup>lambdaUpdate()

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupMemberServiceImpl.java

@@ -60,6 +60,8 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
         BasicUserInfo basicUserInfo = teacherDao.getBasicUserInfo(userId);
 //        String username = roleType== ImGroupMemberRoleType.TEACHER?basicUserInfo.getRealName():basicUserInfo.getUsername();
         ImGroupMember imGroupMember = new ImGroupMember(imGroupId, userId,basicUserInfo.getAvatar(), basicUserInfo.getUsername(), isAdmin, roleType);
+//        String username = roleType== ImGroupMember.ImGroupMemberRoleType.TEACHER?basicUserInfo.getRealName():basicUserInfo.getUsername();
+        ImGroupMember imGroupMember = new ImGroupMember(imGroupId,userId,basicUserInfo.getUsername(),basicUserInfo.getAvatar(), isAdmin, roleType);
         Date date = new Date();
         imGroupMember.setCreateTime(date);
         imGroupMember.setUpdateTime(date);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysManualServiceImpl.java

@@ -1,22 +1,5 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.biz.dal.vo.SysManualVo;
-import com.yonge.toolset.base.exception.BizException;
-import jodd.util.StringUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dao.SysManualDao;
 import com.yonge.cooleshow.biz.dal.entity.SysManual;
@@ -24,6 +7,13 @@ import com.yonge.cooleshow.biz.dal.queryInfo.SysManualQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.SysManualService;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.utils.collection.MapUtil;
+import jodd.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
 
 /**
  * (SysManual)表服务实现类
@@ -66,13 +56,6 @@ public class SysManualServiceImpl extends ServiceImpl<SysManualDao, SysManual> i
     }
 
     public int update(SysManual sysManual, Long userId) {
-        SysManual manual = this.getById(sysManual.getId());
-        if (manual == null) {
-            throw new BizException("未找到相关信息");
-        }
-        if (YesOrNoEnum.YES.getCode().equals(manual.getStatus().getCode())) {
-            throw  new BizException("启用状态下，不能修改");
-        }
         sysManual.setOperatorId(userId);
         sysManual.setUpdateTime(new Date());
         return sysManualDao.updateById(sysManual);
@@ -83,10 +66,5 @@ public class SysManualServiceImpl extends ServiceImpl<SysManualDao, SysManual> i
         List<String> menuIds = sysManualDao.listMenuIds();
         return StringUtil.join(menuIds, ",");
     }
-
-    @Override
-    public IPage<SysManualVo> query(IPage<SysManualVo> page, SysManualQueryInfo queryInfo) {
-        return sysManualDao.query(page,queryInfo);
-    }
 }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -806,7 +806,7 @@
         </foreach>)
     </update>
     <update id="updateEndTime">
-        UPDATE course_schedule SET status_='COMPLETE' WHERE id_ IN(
+        UPDATE course_schedule SET status_='COMPLETE',settlement_time_=NOW() WHERE id_ IN(
         <foreach collection="list" item="item" index="index" open="" close="" separator=",">
             #{item.courseId}
         </foreach>)

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysManualMapper.xml

@@ -67,23 +67,4 @@
 		select menu_id_ from sys_manual
 	</select>
 
-	<select id="query" resultType="com.yonge.cooleshow.biz.dal.vo.SysManualVo">
-		select sm.*
-		, u.username_ as operatorName
-		, m.name_ as menuName
-		from sys_manual sm
-		left join sys_user u on sm.operator_id_ = u.id_
-		left join sys_menu m on sm.menu_id_ = m.id_
-		<where>
-			<if test="param.menuId != null">
-				AND sm.menu_id_ = #{param.menuId}
-			</if>
-			<if test="param.status != null">
-				AND sm.status_ = #{param.status}
-			</if>
-			<if test="param.title != null and param.title != ''">
-				and sm.name_ like concat('%',#{param.title},'%')
-			</if>
-		</where>
-    </select>
 </mapper>