Merge branch 'master-1119' into mp-server-test

# Conflicts:
#	mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserChannelController.java

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

@@ -229,13 +229,13 @@ public class UserTicketOrderController extends BaseApiController {
             return AjaxResult.error("盲票已停售！");
         }
         //免费的盲票每个用户只能领取一次
-        if (orderSettleVO.getPayAmt() == 0 && orderSettleVO.getDiscountAmt() == 0){
+        /*if (orderSettleVO.getPayAmt() == 0 && orderSettleVO.getDiscountAmt() == 0){
             int orderCount = userTicketOrderService.count(
                     new LambdaQueryWrapper<UserTicketOrder>().eq(UserTicketOrder::getUserId, userId).eq(UserTicketOrder::getBoxId, orderSettleVO.getBoxId()));
             if (orderCount > 0) {
                 return AjaxResult.error("您已领取过盲票！");
             }
-        }
+        }*/
         //限制前端重复提交请求
         String repeatSubmitRecord = redisCache.getCacheObject(repeatSubmitKey);
         if (StringUtils.isNotBlank(repeatSubmitRecord)) {

mp-framework/src/main/java/com/qs/mp/framework/config/SecurityConfig.java

@@ -154,7 +154,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                     "/api/v1/mp/user/isJump",
                     "/api/v1/mp/user/mall/ticket/goods/list",
                     "/api/v1/mp/channel/promoter/register",
-                    "/api/v1/mp/channel//saleSite/info/*"
+                    "/api/v1/mp/channel/saleSite/info/*"
                 ).permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()

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

@@ -40,4 +40,7 @@ public class UserPrizeStorageVO extends UserPrizeStorage {
 
     @ApiModelProperty("商品成本")
     private Integer cost;
+
+    @ApiModelProperty("使用链接")
+    private String useLink;
 }

mp-service/src/main/resources/mapper/user/UserPrizeStorageMapper.xml

@@ -30,6 +30,7 @@
         t2.multi_sku isMoreSku ,
         t2.type goodsType,
         t2.discount_rate,
+        t2.use_link,
         t5.type
         FROM
         mp_user_prize_storage t1