fix:商城订单列表加参数

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/OmsOrderController.java

@@ -30,10 +30,10 @@ public class OmsOrderController {
     @ApiOperation("查询订单")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<CommonPage<OmsOrder>> list(OmsOrderQueryParam queryParam,
+    public CommonResult<CommonPage<OrderVo>> list(OmsOrderQueryParam queryParam,
                                                    @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
                                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
-        List<OmsOrder> orderList = orderService.list(queryParam, pageSize, pageNum);
+        List<OrderVo> orderList = orderService.list(queryParam, pageSize, pageNum);
         return CommonResult.success(CommonPage.restPage(orderList));
     }
 

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/dao/OmsOrderDao.java

@@ -17,7 +17,7 @@ public interface OmsOrderDao {
     /**
      * 条件查询订单
      */
-    List<OmsOrder> getList(@Param("queryParam") OmsOrderQueryParam queryParam);
+    List<OrderVo> getList(@Param("queryParam") OmsOrderQueryParam queryParam);
 
     /**
      * 批量发货

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/dto/OrderVo.java

@@ -0,0 +1,58 @@
+package com.yonge.cooleshow.admin.dto;
+
+import com.yonge.cooleshow.mbg.model.OmsOrder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-06-21
+ */
+public class OrderVo extends OmsOrder {
+
+    @ApiModelProperty("用户编号")
+    private String userId;
+
+    @ApiModelProperty("用户昵称")
+    private String username;
+
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    @ApiModelProperty("用户类型 STUDENT：学生  TEACHER:老师")
+    private String userType;
+
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+}

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/OmsOrderService.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.admin.service;
 import com.yonge.cooleshow.admin.dto.*;
 import com.yonge.cooleshow.admin.dto.search.OrderStatisticalSearch;
 import com.yonge.cooleshow.admin.dto.search.UserStatisticalSearch;
-import com.yonge.cooleshow.mbg.model.OmsOrder;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -16,8 +15,9 @@ import java.util.Map;
 public interface OmsOrderService {
     /**
      * 订单查询
+     * @return
      */
-    List<OmsOrder> list(OmsOrderQueryParam queryParam, Integer pageSize, Integer pageNum);
+    List<OrderVo> list(OmsOrderQueryParam queryParam, Integer pageSize, Integer pageNum);
 
     /**
      * 批量发货

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderServiceImpl.java

@@ -54,7 +54,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
     private PmsProductService productService;
 
     @Override
-    public List<OmsOrder> list(OmsOrderQueryParam queryParam, Integer pageSize, Integer pageNum) {
+    public List<OrderVo> list(OmsOrderQueryParam queryParam, Integer pageSize, Integer pageNum) {
         PageHelper.startPage(pageNum, pageSize);
         return orderDao.getList(queryParam);
     }

cooleshow-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

@@ -5,31 +5,44 @@
         <collection property="orderItemList" resultMap="com.yonge.cooleshow.mbg.mapper.OmsOrderItemMapper.BaseResultMap" columnPrefix="item_"/>
         <collection property="historyList" resultMap="com.yonge.cooleshow.mbg.mapper.OmsOrderOperateHistoryMapper.BaseResultMap" columnPrefix="history_"/>
     </resultMap>
-    <select id="getList" resultMap="com.yonge.cooleshow.mbg.mapper.OmsOrderMapper.BaseResultMap">
-        SELECT *
+
+    <resultMap id="orderResultMap" type="com.yonge.cooleshow.admin.dto.OrderVo" extends="com.yonge.cooleshow.mbg.mapper.OmsOrderMapper.BaseResultMap">
+        <result column="userId"  property="userId" />
+        <result column="username"  property="username" />
+        <result column="phone"  property="phone" />
+        <result column="userType"  property="userType" />
+    </resultMap>
+    <select id="getList" resultMap="orderResultMap">
+        SELECT o.*,
+                um.id as userId,
+                um.username as username,
+                um.phone as phone,
+                (select  uop.payment_client_ from user_order_payment uop where uop.order_no_ = o.order_sn order by  uop.id_ desc limit 1) as userType
+
         FROM
-        oms_order
+        oms_order o
+        left join ums_member um on um.id = member_id
         WHERE
-        delete_status = 0
+        o.delete_status = 0
         <if test="queryParam.orderSn!=null and queryParam.orderSn!=''">
-            AND order_sn = #{queryParam.orderSn}
+            AND o.order_sn = #{queryParam.orderSn}
         </if>
         <if test="queryParam.status!=null">
-            AND `status` = #{queryParam.status}
+            AND o.`status` = #{queryParam.status}
         </if>
         <if test="queryParam.sourceType!=null">
-            AND source_type = #{queryParam.sourceType}
+            AND o.source_type = #{queryParam.sourceType}
         </if>
         <if test="queryParam.orderType!=null">
-            AND order_type = #{queryParam.orderType}
+            AND o.order_type = #{queryParam.orderType}
         </if>
         <if test="queryParam.createTime!=null and queryParam.createTime!=''">
-            AND create_time LIKE concat(#{queryParam.createTime},"%")
+            AND o.create_time LIKE concat(#{queryParam.createTime},"%")
         </if>
         <if test="queryParam.receiverKeyword!=null and queryParam.receiverKeyword!=''">
             AND (
-            receiver_name LIKE concat("%",#{queryParam.receiverKeyword},"%")
-            OR receiver_phone LIKE concat("%",#{queryParam.receiverKeyword},"%")
+            o.receiver_name LIKE concat("%",#{queryParam.receiverKeyword},"%")
+            OR o.receiver_phone LIKE concat("%",#{queryParam.receiverKeyword},"%")
             )
         </if>
     </select>

cooleshow-mall/mall-mbg/src/main/resources/config/mybatis/UserOrderPaymentMapper.xml

@@ -246,7 +246,7 @@
     <select id="selectByTranNo" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-      from user_order_payment where trans_no_ = #{orderNo} limit 1
+      from user_order_payment where trans_no_ = #{orderNo} order by id_ desc limit 1
     </select>
 
     <select id="selectByOrderNo" resultMap="BaseResultMap">
@@ -258,25 +258,25 @@
     <select id="selectByOrderNoAndStatusPaying" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-        from user_order_payment where order_no_ = #{orderSn} and status_ = 'pending'
+        from user_order_payment where order_no_ = #{orderSn} and status_ = 'pending' order by id_ desc  limit 1
     </select>
 
     <select id="selectByOrderNoAndStatus" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from user_order_payment where order_no_ = #{orderSn}
-        and status_ = #{payStatus} and pay_channel_ = #{payChannel}
+        and status_ = #{payStatus} and pay_channel_ = #{payChannel} order by id_ desc  limit 1
     </select>
 
     <select id="selectByOrderNoAndStatusSucceeded" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-        from user_order_payment where order_no_ = #{orderSn} and status_ = 'succeeded'
+        from user_order_payment where order_no_ = #{orderSn} and status_ = 'succeeded' order by id_ desc  limit 1
     </select>
 
     <select id="selectByAdapayNo" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-        from user_order_payment where adapay_no_ = #{paymentNo} limit 1
+        from user_order_payment where adapay_no_ = #{paymentNo} order by id_ desc  limit 1
     </select>
 </mapper>

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

@@ -128,4 +128,12 @@ public interface MusicSheetDao extends BaseMapper<MusicSheet> {
      * @return
      */
     List<HomeMusicSheetVo.MusicSheetSmall> selectPayMusicSheet();
+
+    /**
+     * 查询老师曲目审核数量
+     *
+     * @param userId 老师id
+     * @return
+     */
+    TeacherAuditMusicSheetVo selectTeacherCount(@Param("userId") Long userId);
 }

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

@@ -243,4 +243,12 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @return
      */
     MusicSheetWebsiteDetailVo websiteDetail(Long musicSheetId, SysUser sysUser);
+
+    /**
+     * 查询老师曲目审核数量
+     *
+     * @param userId 老师id
+     * @return
+     */
+    TeacherAuditMusicSheetVo selectTeacherCount(Long userId);
 }

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

@@ -784,6 +784,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         return musicSheetWebsiteDetailVo;
     }
 
+    @Override
+    public TeacherAuditMusicSheetVo selectTeacherCount(Long userId) {
+        return baseMapper.selectTeacherCount(userId);
+    }
+
     private SysUser getSysUser(Long userId) {
         return Optional.ofNullable(userId)
                        .map(sysUserFeignService::queryUserById)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherAuditMusicSheetVo.java

@@ -0,0 +1,58 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.toolset.base.page.PageInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-06-21
+ */
+public class TeacherAuditMusicSheetVo {
+
+    @ApiModelProperty("审核通过数量")
+    private Integer pass;
+
+    @ApiModelProperty("审核拒绝数量")
+    private Integer unPass;
+
+    @ApiModelProperty("审核中数量")
+    private Integer doing;
+
+
+    @ApiModelProperty("分页数据")
+    private PageInfo<MusicSheetVo> list;
+
+    public Integer getPass() {
+        return pass;
+    }
+
+    public void setPass(Integer pass) {
+        this.pass = pass;
+    }
+
+    public Integer getUnPass() {
+        return unPass;
+    }
+
+    public void setUnPass(Integer unPass) {
+        this.unPass = unPass;
+    }
+
+    public Integer getDoing() {
+        return doing;
+    }
+
+    public void setDoing(Integer doing) {
+        this.doing = doing;
+    }
+
+    public PageInfo<MusicSheetVo> getList() {
+        return list;
+    }
+
+    public void setList(PageInfo<MusicSheetVo> list) {
+        this.list = list;
+    }
+}

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

@@ -514,4 +514,16 @@
         limit 5
 
     </select>
+
+    <select id="selectTeacherCount" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherAuditMusicSheetVo">
+        select
+            count(if(t.audit_status_ = 'DOING',1,0)) as doing,
+            count(if(t.audit_status_ = 'PASS' and t.state_ = 1,1,0)) as pass,
+            count(if(t.audit_status_ = 'UNPASS',1,0)) as upPass
+
+        from music_sheet t
+        left join sys_user su on t.create_by_ = su.id_
+        where su.id_ = #{userId}
+
+    </select>
 </mapper>

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetController.java

@@ -11,6 +11,7 @@ import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.biz.dal.vo.TeacherAuditMusicSheetVo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -96,7 +97,7 @@ public class MusicSheetController extends BaseController {
 
     @ApiOperation(value = "老师-个人中心-曲目分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/teacher/list", consumes="application/json", produces="application/json")
-    public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody MusicSheetSearch query) {
+    public HttpResponseResult<TeacherAuditMusicSheetVo> list(@RequestBody MusicSheetSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
@@ -108,7 +109,10 @@ public class MusicSheetController extends BaseController {
         }
 
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);
-        return succeed(PageUtil.pageInfo(musicSheetVoIPage));
+
+        TeacherAuditMusicSheetVo teacherAuditMusicSheetVo = musicSheetService.selectTeacherCount(sysUser.getId());
+        teacherAuditMusicSheetVo.setList(PageUtil.pageInfo(musicSheetVoIPage));
+        return succeed(teacherAuditMusicSheetVo);
     }
 
     @ApiOperation(value = "老师新增曲目", httpMethod="POST", consumes="application/json", produces="application/json")