新下单流程优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/audituser/AuditUserDO.java

@@ -36,6 +36,9 @@ public class AuditUserDO extends BaseDO {
      * 审核人
      */
     private Long auditUser;
+
+    @TableField(exist = false)
+    private String auditUserName;
     /**
      * 审核备注信息
      */

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/audituser/AuditUserServiceImpl.java

@@ -2,6 +2,8 @@ package com.yc.ship.module.trade.service.audituser;
 
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.module.system.api.user.AdminUserApi;
+import com.yc.ship.module.system.api.user.dto.AdminUserRespDTO;
 import com.yc.ship.module.trade.controller.admin.audituser.vo.AuditUserPageReqVO;
 import com.yc.ship.module.trade.controller.admin.audituser.vo.AuditUserSaveReqVO;
 import com.yc.ship.module.trade.dal.dataobject.audituser.AuditUserDO;
@@ -25,6 +27,9 @@ public class AuditUserServiceImpl implements AuditUserService {
     @Resource
     private AuditUserMapper auditUserMapper;
 
+    @Resource
+    private AdminUserApi adminUserApi;
+
     @Override
     public Long createAuditUser(AuditUserSaveReqVO createReqVO) {
         // 插入
@@ -64,7 +69,17 @@ public class AuditUserServiceImpl implements AuditUserService {
 
     @Override
     public PageResult<AuditUserDO> getAuditUserPage(AuditUserPageReqVO pageReqVO) {
-        return auditUserMapper.selectPage(pageReqVO);
+        PageResult<AuditUserDO> pageResult = auditUserMapper.selectPage(pageReqVO);
+        for (AuditUserDO auditUserDO : pageResult.getList()) {
+            if(auditUserDO.getAuditUser()!=null) {
+                AdminUserRespDTO user = adminUserApi.getUserIgnoreTenant(auditUserDO.getAuditUser());
+                if (user != null) {
+                    auditUserDO.setAuditUserName(user.getNickname());
+                }
+            }
+        }
+        return pageResult;
     }
 
-}
+}
+

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -193,11 +193,11 @@
              ps.product_tag productTag,ps.product_tag2 productTag2,ps.product_tag3 productTag3,ps.product_tag4 productTag4
         FROM trade_order td
         INNER JOIN trade_order_user tou on td.id = tou.order_id
-        left JOIN trade_detail tdl on td.id = tdl.order_id
+        left JOIN trade_detail tdl on td.id = tdl.order_id and tdl.deleted = 0
         left JOIN product_spu ps on ps.id = tdl.product_id
         LEFT JOIN ota_distributor od on od.id = td.source_id
         LEFT JOIN (select m2.order_id,sum(m2.refund_amount) refund_amount,sum(m2.origin_amount) origin_amount from trade_refund m2  where m2.refund_status = 6 and m2.refund_method !=2 GROUP BY m2.order_id) tr on td.id = tr.order_id
-        where td.deleted = 0 and tou.deleted = 0 and tdl.deleted = 0
+        where td.deleted = 0 and tou.deleted = 0
         <if test="vo.orderStatus!=null and vo.orderStatus.size()>0">
             and  td.order_status in
             <foreach collection="vo.orderStatus" item="item" separator=","  open="(" close=")">