Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!956

mp-service/src/main/java/com/qs/mp/channel/domain/Channel.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qs.mp.common.enums.ChannelCertifyStatusEnum;
 import com.qs.mp.common.enums.ChannelStatusEnum;
@@ -44,6 +45,10 @@ public class Channel implements Serializable {
   @ApiModelProperty("渠道编码")
   private String channelNo;
 
+  @TableField("word_no")
+  @ApiModelProperty("工号")
+  private String wordNo;
+
   /**
    * 渠道名称
    */
@@ -62,7 +67,7 @@ public class Channel implements Serializable {
    * 渠道级别，0:经销商；1:一级渠道；2:二级渠道
    */
   @TableField("level")
-  @ApiModelProperty("渠道级别，0:经销商；1:一级渠道；2:二级渠道")
+  @ApiModelProperty("渠道级别，-1推广员; 0:经销商；1:一级渠道；2:二级渠道")
   private Integer level;
 
   /**
@@ -238,5 +243,13 @@ public class Channel implements Serializable {
   @ApiModelProperty("更新时间")
   private Date updatedTime;
 
+  /**
+   * 逻辑删除标识
+   */
+  @ApiModelProperty("逻辑删除标识")
+  @TableField("is_deleted")
+  @TableLogic
+  private Integer isDeleted;
+
 
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelServiceImpl.java

@@ -62,7 +62,7 @@ public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> impl
   private IUserAddrService userAddrService;
 
   @Override
-  @Transactional
+  @Transactional(rollbackFor = Exception.class)
   public void saveChannel(Channel channel, ChannelRoleEnum channelRole) {
     boolean res = channelService.save(channel);
     if (res && null != channel.getChannelId()) {

mp-service/src/main/java/com/qs/mp/framework/service/impl/AsyncTaskServiceImpl.java

@@ -207,7 +207,7 @@ public class AsyncTaskServiceImpl extends ServiceImpl<AsyncTaskMapper, AsyncTask
     @Transactional(rollbackFor = Exception.class)
     public void cardOrderDeliver(AsyncTask asyncTask) {
         String orderId = asyncTask.getBizId();
-        LogUtil.error(logger, "收到卡密订单自动发货任务。orderId=" + orderId);
+        LogUtil.info(logger, "收到卡密订单自动发货任务。orderId=" + orderId);
         UserDeliverOrder userDeliverOrder = userDeliverOrderService.getById(orderId);
         // 如果是普通订单或者订单不为待发货则不处理
         if (DeliverOrderTypeEnum.ORDINARY.getValue().equals(userDeliverOrder.getType())
@@ -233,7 +233,7 @@ public class AsyncTaskServiceImpl extends ServiceImpl<AsyncTaskMapper, AsyncTask
                 .orderByAsc("rand()")
                 .last("limit " + userDeliverOrderItem.getGoodsNum()));
             if (CollectionUtils.isEmpty(goodsCardList) || goodsCardList.size() < userDeliverOrderItem.getGoodsNum()) {
-                LogUtil.error(logger,"卡密不足，无法发货。orderId:{0},itemId:{1},goodsId:{2}",userDeliverOrderItem.getOrderId(),
+                LogUtil.info(logger,"卡密不足，无法发货。orderId:{0},itemId:{1},goodsId:{2}",userDeliverOrderItem.getOrderId(),
                     userDeliverOrderItem.getItemId(), userDeliverOrderItem.getGoodsId());
                 throw new ServiceException("卡密不足，无法发货");
             }