Merge branch 'master' into hjc-票务平台

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -157,7 +157,7 @@ liquidnet:
     executor-main:
       xxl:
         admin:
-          addresses: 172.17.121.250:8090
+          addresses: 172.17.192.8:8090
   client:
     admin:
 #      phpPayUrl: http://testorder.zhengzai.tv

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

@@ -487,7 +487,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         LocalDateTime now = LocalDateTime.now();
 
         if (dto == null) {
-            return ResponseDto.failure("兑换码有误，请重新输入");
+            return ResponseDto.failure("兑换码有误或已被使用，若已成功兑换，请前往「我的」-「我的券」查看");
         } else if (dto.getState().equals(0)) {//判断可领
             CandyCouponInfoDto infoDto = redisDataUtils.getCouponInfo(dto.getCouponId());
             if (!CouponBaseUtil.CandyCanReceive(infoDto)) {
@@ -529,7 +529,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         String uid = CurrentUtil.getCurrentUid();
         CandyCouponCodeDto dto = redisDataUtils.getCouponByCode(ccode);
         if (dto == null) {
-            return ResponseDto.failure("兑换码有误，请重新输入");
+            return ResponseDto.failure("兑换码有误或已被使用，若已成功兑换，请前往「我的」-「我的券」查看");
         } else if (dto.getState().equals(0)) {//判断可领
             CandyCouponInfoDto infoDto = redisDataUtils.getCouponInfo(dto.getCouponId());
             if (!CouponBaseUtil.CandyCanReceive(infoDto)) {