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

Dev

See merge request quanshu/mp-server!687

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

@@ -105,7 +105,7 @@ public class LinkController {
 
 
         // 生成scheme,并缓存到redis中,1天过期
-        scheme = wxUrlLinkService.generateUrlSchema("", channel.getUserId() + "&" + UserShareVO.SHARE_TYPE_SITE, userAppId);
+        scheme = wxUrlLinkService.generateUrlSchema("", "uid=" + channel.getUserId() + "&t=" + UserShareVO.SHARE_TYPE_SITE, userAppId);
         redisCache.setCacheObject(key, scheme,1, TimeUnit.DAYS);
         LogUtil.info(logger, "生成的scheme码:{0}", scheme);
         return AjaxResult.success("success",scheme);

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

@@ -199,6 +199,9 @@ public class UserTicketController extends BaseApiController {
    */
   @PostMapping("/ticket/queryLuckyNum")
   @ApiOperation(value = "查看盲票幸运数字", notes = "根据盲票组ID，获取盲票幸运数字")
+  @ApiResponses(
+          @ApiResponse(code = 200, message = "success", response = TicketVO.class)
+  )
   public AjaxResult queryLuckyNum(@RequestBody TicketParam param) {
 
     if (StringUtils.isBlank(param.getSerialNo())) {

mp-admin/src/main/resources/application-8100.yml

@@ -134,6 +134,7 @@ mq:
 miniprogram:
   # 接收通知的状态
   state: formal
+  env_version: release
 
 # 盲票导出每页查询数量
 export:

mp-admin/src/main/resources/application-8200.yml

@@ -134,6 +134,7 @@ mq:
 miniprogram:
   # 接收通知的状态
   state: formal
+  env_version: release
 
 # 盲票导出每页查询数量
 export:

mp-admin/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 mp:
     # 文件路径 示例（ Windows配置D:/ygp/uploadPath，Linux配置 /home/ygp/uploadPath）
-    profile: /Users/Steven/Documents/logs
+    profile: /Users/cup/Documents/logs
 
 pay:
     callbackUrl: https://test-mp.quanshu123.com/service/notify/payCallback
@@ -127,6 +127,7 @@ mq:
 miniprogram:
     # 接收通知的状态
     state: developer
+    env_version: trial
 
 # 盲票导出每页查询数量
 export:

mp-admin/src/main/resources/application-test.yml

@@ -132,6 +132,7 @@ mq:
 miniprogram:
   # 接收通知的状态
   state: trial
+  env_version: trial
 
 # 盲票导出每页查询数量
 export:

mp-quartz/src/main/java/com/qs/mp/quartz/task/ChannelOrderTask.java

@@ -49,17 +49,11 @@ public class ChannelOrderTask {
             .eq(ChannelOrder::getStatus, ChannelOrderStatusEnum.NOT_CONFIRM.getValue())
             .le(ChannelOrder::getDeliveryTime, deliveryTime));
 
-    List<ChannelOrder> params = new ArrayList<>();
     if (CollectionUtils.isNotEmpty(channelOrderList)) {
       for (ChannelOrder channelOrder : channelOrderList) {
-        ChannelOrder param = new ChannelOrder();
-        param.setOrderId(channelOrder.getOrderId());
-        param.setConfirmTime(new Date());
-        param.setStatus(ChannelOrderStatusEnum.FINISHED);
-        params.add(param);
+        channelOrderService.confirm(channelOrder);
       }
     }
-    channelOrderService.updateBatchById(params);
 
     LogUtil.info(logger, "...渠道商订单自动确认收货任务结束...");
   }

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketVO.java

@@ -3,6 +3,9 @@ package com.qs.mp.admin.domain.vo;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.qs.mp.admin.domain.TicketBox;
 import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,53 +13,64 @@ import lombok.Data;
  * @Date 2022/3/7
  */
 @Data
+@ApiModel("盲票出参类")
 public class TicketVO {
   // 奖品列表
+  @ApiModelProperty("奖品列表")
   List<TicketAwardsPrizeVO> prizeList;
 
   /**
    * 盲票ID
    */
+  @ApiModelProperty("盲票ID")
   private String ticketId;
 
   /**
    * 盲票组ID
    */
+  @ApiModelProperty("盲票组ID")
   private String boxId;
 
   /**
    * 图片
    */
+  @ApiModelProperty("图片")
   private String picUrl;
 
   /**
    * 标题
    */
+  @ApiModelProperty("标题")
   private String title;
 
   /**
    * 序列号
    */
+  @ApiModelProperty("序列号")
   private String serialNo;
 
   /**
    * 面值
    */
+  @ApiModelProperty("面值")
   private Integer facePrice;
 
   /**
    *
    */
+  @ApiModelProperty("销售价格")
   private Integer salePrice;
 
   /**
    * 明文幸运数字
    */
+  @ApiModelProperty("明文幸运数字")
   private Integer plainLuckyNum;
 
   /**
    * 盲票状态（未付款、已激活、已兑奖、付款中）
    */
+  @ApiModelProperty("盲票状态（未付款、已激活、已兑奖、付款中）")
   private Integer status;
 
 }

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

@@ -251,13 +251,13 @@ public class ChannelOrderServiceImpl extends
         param.setStatus(ChannelOrderStatusEnum.FINISHED);
         param.setConfirmTime(new Date());
         boolean rtn = channelOrderService.updateById(param);
-        Assert.isFalse(rtn,"更新提货订单状态失败,orderId:{0}", order.getOrderId());
+        Assert.isTrue(rtn,"更新提货订单状态失败,orderId:{0}", order.getOrderId());
 
         // 提交异步任务
         AsyncTask asyncTask = new AsyncTask();
         asyncTask.setType(AsyncTaskTypeEnum.CHANNEL_CONFIRM_RECEIPT.getValue());
         asyncTask.setBizId(order.getOrderId());
-        Assert.isFalse(asyncTaskService.save(asyncTask),"提交经销商提货订单确认收货任务失败,orderId:{0}", order.getOrderId());
+        Assert.isTrue(asyncTaskService.save(asyncTask),"提交经销商提货订单确认收货任务失败,orderId:{0}", order.getOrderId());
     }
 
     /**

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

@@ -41,6 +41,9 @@ public class WxUrlLinkServiceImpl implements IWxUrlLinkService {
   @Value("${cloud.public-bucket-name}")
   private String publicBucketName;
 
+  @Value("${miniprogram.env_version}")
+  private String envVersion;
+
   @Override
   public String generate(String path, String query, String appId) {
     Map<String, Object> param = new HashMap<String, Object>();
@@ -74,7 +77,7 @@ public class WxUrlLinkServiceImpl implements IWxUrlLinkService {
     Map<String, Object> jumpParam = new HashMap<>();
     jumpParam.put("path", path);
     jumpParam.put("query", query);
-    jumpParam.put("env_version", "release");
+    jumpParam.put("env_version", envVersion);
     param.put("jump_wxa", jumpParam);
     // 有效时间超过31天的 Link 或永久有效的 Link 为长期有效Link，
     // 单个小程序总共可生成长期有效 Link 上限为10万个，请谨慎调用
@@ -87,8 +90,8 @@ public class WxUrlLinkServiceImpl implements IWxUrlLinkService {
     String res = HttpUtils.sendPost(
         "https://api.weixin.qq.com/wxa/generatescheme?access_token=" + accessToken,
         JSON.toJSONString(param));
-    LogUtil.info(logger, "小程序UrlSchema获取,path:{0},query:{1},res:{2}",
-        new Object[]{path, query, res});
+    LogUtil.info(logger, "小程序UrlSchema获取,path:{0},query:{1},res:{2},jumpParam:{3}",
+        new Object[]{path, query, res, jumpParam});
     JSONObject jsonObject = JSON.parseObject(res);
     if (jsonObject.getIntValue("errcode") != 0) {
       LogUtil.error(logger, "小程序UrlSchema获取错误，res:{0}", res);
@@ -103,7 +106,7 @@ public class WxUrlLinkServiceImpl implements IWxUrlLinkService {
     param.put("path", path + "?" + scene); // 页面路径
     //param.put("scene", scene); // 参数
 //    param.put("check_path", true);// 为 true 时 page 必须是已经发布的小程序存在的页面（否则报错）；为 false 时允许小程序未发布或者 page 不存在
-//    param.put("env_version", "release");
+//    param.put("env_version", envVersion);
     // 获取access_token
     String accessToken = appTokenService.getAccessToken(appId);
     InputStream in = HttpUtils.sendImagePost(
@@ -134,7 +137,7 @@ public class WxUrlLinkServiceImpl implements IWxUrlLinkService {
     param.put("page", path); // 页面路径
     param.put("scene", scene); // 参数
 //    param.put("check_path", true);// 为 true 时 page 必须是已经发布的小程序存在的页面（否则报错）；为 false 时允许小程序未发布或者 page 不存在
-    param.put("env_version", "release");
+    param.put("env_version", envVersion);
     // 获取access_token
     String accessToken = appTokenService.getAccessToken(appId);
     InputStream in = HttpUtils.sendImagePost(