Merge branch 'pre' into 'master'

Pre

See merge request !154

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyUserCouponService.java

@@ -71,8 +71,8 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
     }
 
     public List<CandyUserCouponBasicDto> ucouponBasicDtoByUidProcessing(String uid) {
-        AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
-        if (null == redisCandyUtil.get(AdamRedisConst.INFO_USER.concat(uid))) return null;
+        AbstractRedisUtil redisAdamUtil = redisDataSourceUtil.getRedisAdamUtil();
+        if (null == redisAdamUtil.get(AdamRedisConst.INFO_USER.concat(uid))) return null;
 
         List<CandyUserCouponBasicDto> basicDtoList = candyUserCouponMapper.selectMultiForUserCouponBasicDto(uid);
         if (!CollectionUtils.isEmpty(basicDtoList)) {
@@ -88,6 +88,8 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
                 dto.setUseRules(couponRuleDtoListMap.get(dto.getCouponId()));
             });
 
+
+            AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
             redisCandyUtil.set(CandyRedisConst.BASIC_USER_COUPON.concat(uid), basicDtoList);
         }
         return basicDtoList;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatMaoDengController.java

@@ -51,7 +51,7 @@ public class SweetWechatMaoDengController {
         return ResponseDto.failure("获取信息失败");
     }
 
-    @PostMapping("/addBuilderImg")
+    @PostMapping("/backData")
     @ApiOperation("存生成的图")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "userId", value = "userId"),