candy 修改

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

@@ -201,7 +201,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
                     }
                     break;
                 case 3:
-                    vo.setValue(BigDecimal.valueOf(-1));
+                    vo.setValue(new BigDecimal(totalPrice));
                     break;
                 case 4:
                     vo.setValue(dto.getDiscount());

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

@@ -83,7 +83,7 @@ public class CouponBaseUtil {
         vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setUsedFor(dtoItem.getUsedFor());
         //适用范围 规则
-        if (dtoItem.getUseRules() == null && dtoItem.getBusiType().equals(1)) {
+        if (dtoItem.getBusiType().equals(0)) {
             isTarget = true;
         } else {
             for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) {
@@ -150,7 +150,7 @@ public class CouponBaseUtil {
         vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setUsedFor(dtoItem.getUsedFor());
         //适用范围 规则
-        if (dtoItem.getUseRules() == null && dtoItem.getBusiType().equals(1)) {
+        if (dtoItem.getBusiType().equals(0)) {
             isTarget = true;
         } else {
             for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) {

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/resources/sqlmap.properties

@@ -3,4 +3,4 @@ candy_coupon.use=UPDATE candy_user_coupon SET state = 3 WHERE uid = ? AND ucoupo
 #  --  回退券  --
 candy_coupon.back=UPDATE candy_user_coupon SET state = 1 WHERE uid = ? AND ucoupon_id = ?
 #  --  领取券  --
-candy_coupon.receive=INSERT INTO candy_user_coupon (ucoupon_id , uid , state , coupon_id , ccdoe , bind_at ) VALUE ( ? , ? , ? , ? , ? , ? )
+candy_coupon.receive=INSERT INTO candy_user_coupon (ucoupon_id , uid , state , coupon_id , ccode , bind_at ) VALUE ( ? , ? , ? , ? , ? , ? )

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerCandyCouponReceiveRedisStreamConfig.java

@@ -67,7 +67,7 @@ public class ConsumerCandyCouponReceiveRedisStreamConfig {
     }
 
     @Bean
-    public Subscription subscriptionSqlCandyCouponBack3(RedisConnectionFactory factory) {
+    public Subscription subscriptionSqlCandyCouponReceive3(RedisConnectionFactory factory) {
         var listenerContainer = this.buildStreamMessageListenerContainer(factory);
         var subscription = receiveSqlCandyCouponReceive(listenerContainer, 1);
         listenerContainer.start();