Merge branch 'main' of http://117.174.100.38:3000/lishiqiang/ship-ota-server into main1

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/suppliercategory/SupplierCategoryDO.java

@@ -1,6 +1,7 @@
 package com.yc.ship.module.resource.dal.dataobject.suppliercategory;
 
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
@@ -21,7 +22,7 @@ public class SupplierCategoryDO {
     /**
      * 供应商主键
      */
-
+    @TableId
     private Long supplierId;
     /**
      * 资源类型主键

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/audituser/vo/AuditUserRespVO.java

@@ -1,5 +1,7 @@
 package com.yc.ship.module.trade.controller.admin.audituser.vo;
 
+import com.yc.ship.framework.excel.core.annotations.DictFormat;
+import com.yc.ship.framework.excel.core.convert.DictConvert;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -13,17 +15,20 @@ import com.alibaba.excel.annotation.*;
 public class AuditUserRespVO {
 
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24108")
-    @ExcelProperty("主键")
     private Long id;
 
     @Schema(description = "审核类型 1、1级审核 2、2级审核 3、3级审核 4、4级审核", example = "1")
-    @ExcelProperty("审核类型 1、1级审核 2、2级审核 3、3级审核 4、4级审核")
+    @ExcelProperty(value = "审核类型", converter = DictConvert.class)
+    @DictFormat("trade_audit_type")
     private Integer type;
 
     @Schema(description = "审核人")
-    @ExcelProperty("审核人")
     private Long auditUser;
 
+    @Schema(description = "审核人")
+    @ExcelProperty("审核人")
+    private String auditUserName;
+
     @Schema(description = "当前审核阶段 1、1级审核 2、2级审核 3、3级审核 4、4级审核", example = "1")
     private Long auditStatus;
 

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

@@ -26,7 +26,7 @@ public class AuditUserDO extends BaseDO {
     /**
      * 主键
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 审核类型 1、1级审核 2、2级审核 3、3级审核 4、4级审核
@@ -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

@@ -1,7 +1,10 @@
 package com.yc.ship.module.trade.service.audituser;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 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,10 +28,14 @@ public class AuditUserServiceImpl implements AuditUserService {
     @Resource
     private AuditUserMapper auditUserMapper;
 
+    @Resource
+    private AdminUserApi adminUserApi;
+
     @Override
     public Long createAuditUser(AuditUserSaveReqVO createReqVO) {
         // 插入
         AuditUserDO auditUser = BeanUtils.toBean(createReqVO, AuditUserDO.class);
+        auditUser.setId(IdWorker.getId());
         auditUserMapper.insert(auditUser);
         // 返回
         return auditUser.getId();
@@ -64,7 +71,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/java/com/yc/ship/module/trade/service/order/impl/TradeCheckHandleServiceImpl.java

@@ -306,7 +306,7 @@ public class TradeCheckHandleServiceImpl implements TradeCheckHandleService {
         extMap.put("targetNo", respVO.getTargetNo());
         extMap.put("checkType", CheckTypeEnum.getName(checkReqVO.getType()));
         extMap.put("machineInfo", StrUtil.isNotBlank(checkReqVO.getMachineName())?"在【"+checkReqVO.getMachineName()+"】设备处, ":"");
-        String res = "";
+        String res;
         if(respVO.getIsSuccess() == 1){
             res = "成功";
         }else{
@@ -316,7 +316,6 @@ public class TradeCheckHandleServiceImpl implements TradeCheckHandleService {
                 res = "失败: " + respVO.getMsg() + "，子票: (" + detailBaseNames + ")";
             }
         }
-//        extMap.put("checkResult", (respVO.getIsSuccess() == 1 ? "成功" : "失败: " + respVO.getMsg()) + "，子票: (" + detailBaseNames + ")");
         extMap.put("checkResult", res);
         return extMap;
     }
@@ -328,6 +327,7 @@ public class TradeCheckHandleServiceImpl implements TradeCheckHandleService {
      * @param checkReqVO 参数
      */
     @Override
+    @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.ORDER_CHECK)
     public List<TradeCheckRespVO> checkOrderHandle(String checkCode, TradeCheckReqVO checkReqVO) {
 
         TradeOrderDO orderDO = tradeOrderMapper.queryOneByOrderNo(checkCode);
@@ -350,6 +350,17 @@ public class TradeCheckHandleServiceImpl implements TradeCheckHandleService {
                         .targetNo(orderDO.getOrderNo())
                         .isSuccess(1)
                         .msg("订单核销成功").build());
+                Integer statusOld = orderDO.getOrderStatus();
+                Integer statusNew = orderStatus;
+
+                Map<String, Object> extMap = new HashMap<>();
+                extMap.put("checkCodeType", CheckCodeTypeEnum.getName(checkReqVO.getCodeType()));
+                extMap.put("targetNo", orderDO.getOrderNo());
+                extMap.put("checkType", CheckTypeEnum.getName(checkReqVO.getType()));
+                extMap.put("machineInfo", StrUtil.isNotBlank(checkReqVO.getMachineName())?"在【"+checkReqVO.getMachineName()+"】设备处, ":"后台");
+                String res = "成功";
+                extMap.put("checkResult", res);
+                TradeOrderLogUtils.setOrderInfo(orderDO.getId(), statusOld, statusNew,extMap);
             }
         }
         return result;
@@ -376,10 +387,6 @@ public class TradeCheckHandleServiceImpl implements TradeCheckHandleService {
             Integer statusOld = 7;
             Integer statusNew = 7;
             if (respVO.getIsSuccess() == 1) {
-//                String s = updateOrderStatus(detailDO.getOrderId());
-//                String[] split = s.split(":");
-//                statusOld = Integer.valueOf(split[0]);
-//                statusNew = Integer.valueOf(split[1]);
                 tradePublishUtils.updateOrderStatusMsg(detailDO.getOrderId()+"");
             }
             TradeOrderLogUtils.setOrderInfo(detailDO.getOrderId(), statusOld, statusNew,

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -325,18 +325,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     }
 
     private CommonResult<TradeOrderRespDTO> doShipModifyOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO otcTradeOrderCreateReqVO) {
-        try {
-            ShipTradeOrderCreateReqVO.OrderProperty orderProperty = otcTradeOrderCreateReqVO.getOrderProperty();
-            if (orderProperty == null) {
-                orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
-            }
-            orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
-            setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
-            otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
-            return tradeOrderService.modifyShipOrder(otcTradeOrderCreateReqVO);
-        } catch (Exception e) {
-            throw e;
+        ShipTradeOrderCreateReqVO.OrderProperty orderProperty = otcTradeOrderCreateReqVO.getOrderProperty();
+        if (orderProperty == null) {
+            orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
         }
+        orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
+        setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
+        otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
+        return tradeOrderService.modifyShipOrder(otcTradeOrderCreateReqVO);
     }
 
 
@@ -1801,7 +1797,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
     private void setShipOrderPropertyFromLoginUser(LoginUser loginUser, ShipTradeOrderCreateReqVO.OrderProperty orderProperty) {
         orderProperty.setSellerId(loginUser.getId().toString());
-        orderProperty.setSellMethod(SellMethodEnum.WINDOW.getType());
+//        orderProperty.setSellMethod(SellMethodEnum.WINDOW.getType());
     }
 
     @Override
@@ -2389,14 +2385,16 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (!Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount()) && loginUser.getDistributorId() == null) {
             auditType = 3;
         }
-        if (auditType > 0 && loginUser.getDistributorId() != null && createVO.getIsYd() != 1) {
+        String msg="";
+        if (auditType > 0 && createVO.getIsYd() != 1) {
             tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", auditType).set("order_status", TradeOrderStatusEnum.TRANSFER.getStatus()).set("audit_status", 1).eq("id", neworderId));
+            msg = "修改提交成功，等待管理员审核";
         }
 
         tradeOrderRoomModelMapper.insertBatch(list);
 
         OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
-        return CommonResult.success(respVO);
+        return CommonResult.success(respVO,msg);
 
     }
 

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=")">
@@ -2119,7 +2119,7 @@
                  INNER JOIN trade_order o2 ON d2.order_id = o2.id
         WHERE o.order_no = #{orderNo}
         union all
-        SELECT o.* FROM trade_order o WHERE o.sell_method in (0,1,6,7) and o.order_no = #{orderNo}
+        SELECT o.* FROM trade_order o WHERE o.sell_method in (0,1,4,6,7) and o.order_no = #{orderNo}
     </select>
 
     <select id="updateAppletProductSellNum">