Przeglądaj źródła

路径添加参数

Qchen 2 miesięcy temu
rodzic
commit
0e691ba788

+ 1 - 1
market/src/main/java/com/ruoyi/market/domain/vo/DrawCallBackQueryVo.java

@@ -14,6 +14,6 @@ public class DrawCallBackQueryVo {
     private String drawActivityId;
 
     @ApiModelProperty("结果")
-    private String result;
+    private Integer result;
 
 }

+ 0 - 1
market/src/main/java/com/ruoyi/market/service/impl/MarketAdvertisingAwardServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.market.domain.MarketAdvertisingAward;
-import com.ruoyi.market.domain.MarketDrawActivityProbability;
 import com.ruoyi.market.domain.vo.AdvertisingAwardQueryVo;
 import com.ruoyi.market.mapper.MarketAdvertisingAwardMapper;
 import com.ruoyi.market.service.MarketAdvertisingAwardService;

+ 1 - 1
market/src/main/java/com/ruoyi/market/service/impl/MarketAwardLibraryServiceImpl.java

@@ -111,7 +111,7 @@ public class MarketAwardLibraryServiceImpl extends ServiceImpl<MarketAwardLibrar
         marketAwardLog.setWinningMethod("0");  // 抽奖发放
         marketAwardLogService.save(marketAwardLog);
 
-        return false;
+        return true;
     }
 
     /**

+ 1 - 1
market/src/main/java/com/ruoyi/market/service/impl/MarketDrawActivityServiceImpl.java

@@ -187,7 +187,7 @@ public class MarketDrawActivityServiceImpl extends ServiceImpl<MarketDrawActivit
         marketUserDrawService.updateById(userDrawNumber);
 
         //发放奖励
-
+        marketAwardLibraryService.grantAward(drawCallBackQueryVo.getDrawActivityId(),drawCallBackQueryVo.getUserId(),drawCallBackQueryVo.getResult());
         return true;
     }
 

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/callback/CallBackController.java

@@ -57,7 +57,7 @@ public class CallBackController{
             redisCache.deleteObject(DrawConstants.REDIS_DRAW_ACTIVITY_KEY + drawCallBackVo.getUserId());
             throw new RuntimeException("请求超时");
         }
-        if(!drawCallBackVo.getResult().equals(cacheObject.toString())){
+        if(!drawCallBackVo.getResult().toString().equals(cacheObject.toString())){
             redisCache.deleteObject(DrawConstants.REDIS_DRAW_ACTIVITY_KEY + drawCallBackVo.getUserId());
             throw new RuntimeException("数据异常");
         }

+ 1 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wechat/WechatController.java

@@ -70,7 +70,6 @@ public class WechatController {
     public String getQrCode(@RequestBody WechatVo wechatVo) {
         String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + getAccessToken();
 
-        System.out.println(getAccessToken());
         HttpClient httpClient = HttpClients.createDefault();
         HttpPost httpPost = new HttpPost(url);
 
@@ -79,8 +78,7 @@ public class WechatController {
         String sceneValue = wechatVo.getUserId() +' '+ wechatVo.getActivityId();
         MarketDrawActivity activity = marketDrawActivityService.getById(wechatVo.getActivityId());
         MarketDrawTemplate template = marketDrawTemplateService.getById(activity.getTemplateId());
-        params.put("path", template.getTemplateAppletPage()); // 路径
-
+        params.put("path", template.getTemplateAppletPage() + "?userId=" + wechatVo.getUserId() + "&activityId=" + wechatVo.getActivityId()); // 路径
         try {
             StringEntity entity = new StringEntity(params.toJSONString(), "UTF-8");
             httpPost.setEntity(entity);