Merge remote-tracking branch 'origin/20230928_pickup' into mp-server-test

# Conflicts:
#	mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelMgrController.java
#	mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/SaleSiteMgrController.java
#	mp-service/src/main/java/com/qs/mp/channel/domain/Channel.java
#	mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelVO.java
#	mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelServiceImpl.java
#	mp-service/src/main/resources/mapper/system/SysUserRoleMapper.xml

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelMgrController.java

@@ -153,7 +153,6 @@ public class ChannelMgrController extends BaseApiController {
         queryWrapper.eq(null != channel && null != channel.getCityId(), "t1.city_id", channel.getCityId());
         queryWrapper.eq(null != channel && null != channel.getAreaId(), "t1.area_id", channel.getAreaId());
         list = channelService.selectChannelList(queryWrapper);
-
         if (null != list && list.size() > 0) {
             for (ChannelVO channelVO : list) {
                 //判断当前渠道下有无子渠道和门店
@@ -404,7 +403,6 @@ public class ChannelMgrController extends BaseApiController {
         return "";
     }
 
-
     /**
      * 渠道转门店
      *
@@ -418,7 +416,7 @@ public class ChannelMgrController extends BaseApiController {
     @ApiOperation(value = "渠道转门店", notes = "渠道转门店")
     @PostMapping("/transform")
     @PreAuthorize("@ss.hasPermi('business:channel:edit')")
-    public AjaxResult channelTransformToShop(@RequestBody ChannelParam channelParam) {
+    public AjaxResult channelTransformToShop( @RequestBody ChannelParam channelParam) {
         if (null == channelParam || null == channelParam.getChannelId() || null == channelParam.getParentId()) {
             return error(ErrorCodeEnum.ERROR_CODE_1001);
         }
@@ -431,7 +429,7 @@ public class ChannelMgrController extends BaseApiController {
         if (channelParam.getChannelId() == channelParam.getParentId()){
             return AjaxResult.error("渠道'" + channel.getName() + "'转门店失败，不能选择自己作为上级渠道");
         }
-        //判断当前渠道下有无子渠道和门店
+        //判断当前渠道下有无子渠道
         LambdaQueryWrapper<Channel> queryWrapper = new LambdaQueryWrapper<>();
         if (null != channelParam.getChannelId()) {
             queryWrapper.eq(Channel::getParentId, channelParam.getChannelId());
@@ -447,26 +445,26 @@ public class ChannelMgrController extends BaseApiController {
         Channel parentChannel = channelService.getById(channelParam.getParentId());
         boolean mobileChange = false;  // 手机号码是否有变更
         channel.setParentId(channelParam.getParentId());
-        channel.setLevel(0);
+        channel.setLevel(2);
         channel.setChannelNo(parentChannel.getChannelNo()+"."+channel.getChannelId());
         //佣金比例暂定为0
         channel.setCommRate(BigDecimal.ZERO);
         /**
-        //校验佣金比例，不能高于其父经销商的佣金比例
-        if (null != channel.getParentId() && channel.getParentId() != 0) {
-            Channel parentChannel = channelService.getById(channel.getParentId());
-            if (null != parentChannel) {
-                if (null != parentChannel.getCommRate()
-                        && channel.getCommRate().compareTo(parentChannel.getCommRate()) > 0) {
-                    return AjaxResult.error("佣金比例不能高于父经销商的佣金比例");
-                }
-                channel.setLevel(parentChannel.getLevel() + 1);
-                channel.setChannelNo(parentChannel.getChannelNo() + ".");
-            } else {
-                return AjaxResult.error("父经销商不存在");
-            }
-
-        }
+         //校验佣金比例，不能高于其父经销商的佣金比例
+         if (null != channel.getParentId() && channel.getParentId() != 0) {
+         Channel parentChannel = channelService.getById(channel.getParentId());
+         if (null != parentChannel) {
+         if (null != parentChannel.getCommRate()
+         && channel.getCommRate().compareTo(parentChannel.getCommRate()) > 0) {
+         return AjaxResult.error("佣金比例不能高于父经销商的佣金比例");
+         }
+         channel.setLevel(parentChannel.getLevel() + 1);
+         channel.setChannelNo(parentChannel.getChannelNo() + ".");
+         } else {
+         return AjaxResult.error("父经销商不存在");
+         }
+
+         }
          */
         channelService.updateChannel(channel, mobileChange);
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/SaleSiteMgrController.java

@@ -482,12 +482,12 @@ public class SaleSiteMgrController extends BaseApiController {
         }
 
         boolean rtn = channelService.update(new LambdaUpdateWrapper<Channel>()
-            .set(Channel::getName, saleSiteEditParam.getName())
-            .set(Channel::getChannelNo, parentChannel.getChannelNo()+"."+channel.getChannelId())
-            .set(Channel::getParentId, saleSiteEditParam.getParentId())
-            .set(Channel::getMobile, saleSiteEditParam.getMobile())
-            .set(saleSiteEditParam.getCommFlag() != null, Channel::getCommFlag, saleSiteEditParam.getCommFlag())
-            .eq(Channel::getChannelId, saleSiteEditParam.getChannelId()));
+                .set(Channel::getName, saleSiteEditParam.getName())
+                .set(Channel::getChannelNo, parentChannel.getChannelNo()+"."+channel.getChannelId())
+                .set(Channel::getParentId, saleSiteEditParam.getParentId())
+                .set(Channel::getMobile, saleSiteEditParam.getMobile())
+                .set(saleSiteEditParam.getCommFlag() != null, Channel::getCommFlag, saleSiteEditParam.getCommFlag())
+                .eq(Channel::getChannelId, saleSiteEditParam.getChannelId()));
 
         if (mobileChange){
             //修改用户信息
@@ -661,7 +661,6 @@ public class SaleSiteMgrController extends BaseApiController {
         return AjaxResult.success(channelVO);
     }
 
-
     /**
      * 门店转渠道
      *
@@ -686,6 +685,8 @@ public class SaleSiteMgrController extends BaseApiController {
         }
 
         //修改门店为渠道
+        //查询上级代理信息
+        Channel parentChannel = channelService.getById(channelParam.getParentId());
         boolean mobileChange = false;  // 手机号码是否有变更
         channel.setParentId(0L);
         channel.setLevel(1);
@@ -717,6 +718,4 @@ public class SaleSiteMgrController extends BaseApiController {
         return AjaxResult.success("门店'" + channel.getName() + "'变更为渠道成功");
     }
 
-
-
 }

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -336,8 +336,21 @@ public class UserDeliverOrderController extends BaseApiController {
         if (null == orderSettleVO) {
             return AjaxResult.error("订单已过期，请重新下单");
         }
-        if (null == orderSettleVO.getAddr()) {
+        if (order.getGoodsType() == 1 && null == orderSettleVO.getAddr()) {
             return AjaxResult.error("请填写收货地址");
+        }else if (order.getGoodsType() == 2){
+            //读取默认地址
+            UserAddr addr = userAddrService.getDefaultChannelAddr(userId);
+            if (null != addr) {
+                orderSettleVO.setAddr(addr);
+            }else {
+                addr = new UserAddr();
+                addr.setUserId(userId);
+                addr.setStatus(0);
+                addr.setCommonAddr(1);
+                orderSettleVO.setAddr(addr);
+            }
+
         }
         String orderId = userDeliverOrderService.submitOrder(userId, order.getMemo(), orderSettleVO);
         JSONObject jsonObject = new JSONObject();

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

@@ -240,7 +240,6 @@ public class Channel implements Serializable {
   @ApiModelProperty("门店二维码")
   private String qrCodePic;
 
-
   /**
    * 创建时间
    */

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

@@ -40,10 +40,6 @@ public class ChannelVO extends Channel {
     @ApiModelProperty("线上销售（显示盲票销售张数）")
     long onLineSaleCnt; // 线上销售（显示盲票销售张数）
 
-    /**
-     * 是否可转为门店标识
-     */
     @ApiModelProperty("是否可转为门店标识")
-    private Boolean isTransform = true;
-
+    Boolean isTransform = true;
 }

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

@@ -30,7 +30,6 @@ import com.qs.mp.common.jsms.JSMSUtils;
 import com.qs.mp.system.domain.SysRole;
 import com.qs.mp.system.domain.SysUser;
 import com.qs.mp.system.domain.SysUserRole;
-import com.qs.mp.system.mapper.SysUserRoleMapper;
 import com.qs.mp.system.service.ISysRoleService;
 import com.qs.mp.system.service.ISysUserService;
 import com.qs.mp.user.domain.UserAddr;

mp-service/src/main/java/com/qs/mp/user/domain/UserDeliverOrder.java

@@ -165,5 +165,6 @@ public class UserDeliverOrder implements Serializable {
   @Version
   private Date updatedTime;
 
-
+  @ApiModelProperty("商品类型:1实物,2卡密")
+  private Integer goodsType;
 }

mp-service/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -41,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	        #{userId}
             </foreach> 
 	</delete>
-
 	<select id="selectUserRoleById" parameterType="java.lang.Long" resultMap="SysUserRoleResult">
 		select user_id, role_id from sys_user_role
 		where user_id = #{userId}
@@ -50,4 +49,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="updateUserRole" parameterType="com.qs.mp.system.domain.SysUserRole">
 		update sys_user_role set role_id = #{roleId} where user_id=#{userId}
 	</update>
-</mapper> 
+</mapper>