械字号三类商品提交提示

src/main/java/com/caimei365/order/controller/OrderClubApi.java

@@ -152,7 +152,7 @@ public class OrderClubApi {
         if (null == orderDto.getOrderId()) {
             return ResponseJson.error("订单Id不能为空！", null);
         }
-        return orderClubService.cancelMainOrder(orderDto.getOrderId(), orderDto.getRemark());
+        return orderClubService.cancelMainOrder(orderDto.getOrderId(), orderDto.getUserIdentity(), orderDto.getRemark());
     }
 
     /**

src/main/java/com/caimei365/order/model/dto/OrderDto.java

@@ -24,6 +24,11 @@ public class OrderDto implements Serializable {
      */
     @ApiModelProperty("用户Id")
     private Integer userId;
+    /**
+     * 用户身份 1协销 其他用户
+     */
+    @ApiModelProperty("用户身份 1协销 其他用户")
+    private Integer userIdentity;
     /**
      * 备注（订单取消原因）
      */

src/main/java/com/caimei365/order/service/OrderClubService.java

@@ -22,7 +22,7 @@ public interface OrderClubService {
     ResponseJson<Map<String, Object>> getOrderCount(Integer userId);
     /**
      * 机构订单列表
-     * 
+     *
      * @param userId     用户Id
      * @param orderState 1:待确认,2:待付款,3:待发货,4:已发货,5:退货款
      * @param orderNo    订单编号
@@ -59,9 +59,10 @@ public interface OrderClubService {
     /**
      * 机构取消订单
      * @param orderId  订单Id
+     * @param userIdentity    用户身份 1协销 其他用户
      * @param remark    备注（订单取消原因）
      */
-    ResponseJson<Void> cancelMainOrder(Integer orderId, String remark);
+    ResponseJson<Void> cancelMainOrder(Integer orderId,Integer userIdentity, String remark);
     /**
      * 机构删除订单
      * @param orderId  订单Id

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -487,11 +487,12 @@ public class OrderClubServiceImpl implements OrderClubService {
      * 机构取消订单
      *
      * @param orderId 订单Id
+     * @param userIdentity  用户身份 1协销 其他用户
      * @param remark  备注（订单取消原因）
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseJson<Void> cancelMainOrder(Integer orderId, String remark) {
+    public ResponseJson<Void> cancelMainOrder(Integer orderId,Integer userIdentity, String remark) {
         OrderPo order = orderClubMapper.getMainOrderByOrderId(orderId);
         boolean cancelFlag = (null != order && (OrderStatus.UNCONFIRMED.getCode() == order.getStatus() || OrderStatus.UNRECEIVED_AND_UNSHIPPED.getCode() == order.getStatus()));
         if (!cancelFlag) {
@@ -520,7 +521,11 @@ public class OrderClubServiceImpl implements OrderClubService {
         }
         order.setStatus(6);
         if (StringUtils.isBlank(remark)) {
-            remark = "协销或用户主动取消订单";
+            if (userIdentity == 1) {
+                remark = "协销帮用户取消订单";
+            } else {
+                remark = "用户主动取消订单";
+            }
         }
         order.setCloseReason(remark);
         order.setCloseTime(curDateStr);

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -87,7 +87,6 @@ public class SubmitServiceImpl implements SubmitService {
         if (!StringUtils.isNotBlank(firstClubType)) {
             firstClubType = "0";
         }
-        log.info("firstClubType======>"+firstClubType);
         try {
             ArrayList<Integer> list = new ArrayList<>();
             JSONArray orderInfo = parseArray(submitDto.getOrderInfo());
@@ -101,10 +100,8 @@ public class SubmitServiceImpl implements SubmitService {
                     list.add((Integer) product.get("skuId"));
                 }
             }
-            log.info("list==========>"+list);
             // 获取订单商品械字号类型
             List<String> machineType = baseMapper.machineTypeByID(list);
-            log.info("machineType=====>"+machineType);
             for (String str : machineType) {
                 if ("3".equals(str)) {
                     bol = true;