增减积分用队列

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/GoblinQueueBizIntegralDto.java

+package com.liquidnet.service.goblin.dto;
+
+import com.liquidnet.commons.lang.util.JsonUtils;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 积分增减队列消息体
+ *
+ * @author jiangxiulong
+ */
+@Data
+public class GoblinQueueBizIntegralDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 7538372638864080920L;
+
+    private String content;
+    private BigDecimal score;
+    private String uid;
+    private int type; // 1增 2减
+
+    private static final GoblinQueueBizIntegralDto obj = new GoblinQueueBizIntegralDto();
+
+    public static GoblinQueueBizIntegralDto getNew() {
+        try {
+            return (GoblinQueueBizIntegralDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinQueueBizIntegralDto();
+        }
+    }
+
+    public String toJson() {
+        return JsonUtils.toJson(this);
+    }
+}

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -268,7 +268,6 @@ public class MQConst {
         GOBLIN_STORE_MARKET("goblin:stream:store.market", "group.store.market", "店铺活动"),
         GOBLIN_SELF_MARKET("goblin:stream:self.market", "group.self.market", "平台活动"),
         GOBLIN_ORDER_CREATE_PAY("goblin:stream:order:create_pay", "group.order:create_pay", "订单创建&支付"),
-        GOBLIN_NFT_ORDER("goblin:stream:nftOrder:create", "group.nftOrder:create", "NFT订单处理"),
         GOBLIN_SHOP_CART("goblin:stream:sql.shopcart","group.shop.shopcart","购物车"),
         GOBLIN_ORDER_AGAIN("goblin:stream:order:again", "group.order:again", "订单再次支付"),
         GOBLIN_ORDER_CLOSE("goblin:stream:order:close", "group.order:close", "订单关闭"),
@@ -291,6 +290,10 @@ public class MQConst {
         BIZ_ARTWORK_CLQ("goblin:stream:biz_art:clq", "group.biz.artwork", "藏品声明查询"),
         BIZ_ARTWORK_GEN("goblin:stream:biz_art:gen", "group.biz.artwork", "藏品生成"),
         SQL_ARTWORK_GEN("goblin:stream:sql_art:gen", "group.biz.artwork", "藏品生成"),
+
+        GOBLIN_NFT_ORDER("goblin:stream:nftOrder:create", "group.nftOrder:create", "NFT订单处理"),
+        BIZ_INTEGRAL("goblin:stream:biz_integral", "group.biz.integral", "增减积分操作"),
+
         ;
 
         private final String key;

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

@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.RedisStreamConfig;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerGoblinBizArtworkClqRdsReceiver;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerGoblinBizArtworkUplRdsReceiver;
+import com.liquidnet.service.consumer.kylin.receiver.ConsumerGoblinBizIntegralReceiver;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -29,6 +30,8 @@ public class ConsumerCommonBizRedisStreamConfig extends RedisStreamConfig {
     ConsumerGoblinBizArtworkClqRdsReceiver consumerGoblinBizArtworkClqRdsReceiver;
 //    @Autowired
 //    ConsumerGoblinBizArtworkGenRdsReceiver consumerGoblinBizArtworkGenRdsReceiver;
+    @Autowired
+    ConsumerGoblinBizIntegralReceiver consumerGoblinBizIntegralReceiver;
 
     @Bean// 藏品上传声明
     public List<Subscription> subscriptionBizArtworkUpl(RedisConnectionFactory factory) {
@@ -77,4 +80,20 @@ public class ConsumerCommonBizRedisStreamConfig extends RedisStreamConfig {
 //        }
 //        return subscriptionList;
 //    }
+
+    @Bean// 增减积分
+    public List<Subscription> subscriptionBizIntegral(RedisConnectionFactory factory) {
+        List<Subscription> subscriptionList = new ArrayList<>();
+        MQConst.GoblinQueue stream = MQConst.GoblinQueue.BIZ_INTEGRAL;
+        this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
+        for (int i = 0; i < 5; i++) {
+            StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
+            subscriptionList.add(listenerContainer.receiveAutoAck(
+                    Consumer.from(stream.getGroup(), getConsumerName(stream.name() + i)),
+                    StreamOffset.create(stream.getKey(), ReadOffset.lastConsumed()), consumerGoblinBizIntegralReceiver
+            ));
+            listenerContainer.start();
+        }
+        return subscriptionList;
+    }
 }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerGoblinBizIntegralReceiver.java

+package com.liquidnet.service.consumer.kylin.receiver;
+
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.goblin.dto.GoblinQueueBizIntegralDto;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.stereotype.Component;
+import org.springframework.util.MultiValueMap;
+
+import java.util.HashMap;
+
+@Slf4j
+@Component
+public class ConsumerGoblinBizIntegralReceiver extends AbstractBizRedisReceiver {
+
+    @Value("${liquidnet.service.stone.url}")
+    private String stoneUrl;
+
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.GoblinQueue.BIZ_ARTWORK_UPL.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.GoblinQueue.BIZ_ARTWORK_UPL.getGroup();
+    }
+
+    @Override
+    protected boolean consumerMessageHandler(String msg) {
+        boolean aBoolean = false;
+        try {
+            GoblinQueueBizIntegralDto fromJsonObj = JsonUtils.fromJson(msg, GoblinQueueBizIntegralDto.class);
+            if (fromJsonObj == null) {
+                log.warn("CONSUMER MSG NULL_DTO ==> [{}]:{}", this.getRedisStreamKey(), msg);
+                aBoolean = true;
+            } else {
+                aBoolean = this.bizIntegralProcessing(fromJsonObj);
+            }
+        } catch (Exception e) {
+            log.error("CONSUMER MSG EX_HANDLE ==> [{}]:{}", this.getRedisStreamKey(), msg, e);
+        } finally {
+            if (!aBoolean) {
+                HashMap<String, String> map = CollectionUtil.mapStringString();
+                map.put(MQConst.QUEUE_MESSAGE_KEY, msg);
+                stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(this.getRedisStreamKey()));
+            }
+        }
+        return aBoolean;
+    }
+
+    private boolean bizIntegralProcessing(GoblinQueueBizIntegralDto dto) {
+        try {
+            log.info("bizIntegralProcessing params:{}", dto);
+            String uid = dto.getUid(), score = String.valueOf(dto.getScore()), content = dto.getContent();
+            int type = dto.getType();
+            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+            header.add("Accept", "application/json;charset=UTF-8");
+            MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
+            params.add("score", score);
+            params.add("content", content);
+            params.add("uid", uid);
+            String resultData = "";
+            if (type == 1) {
+                resultData = HttpUtil.post(stoneUrl + "/user/logs/in2111", params, header);
+            } else {
+                resultData = HttpUtil.post(stoneUrl + "/user/logs/de2111", params, header);
+            }
+            log.info("bizIntegralProcessing result:{}", resultData);
+            return true;
+        } catch (Exception e) {
+            log.error("bizIntegralProcessing e:{}", e);
+            return false;
+        }
+    }
+
+    /* ------------------------------------------------------------------------------------ */
+}

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -8,7 +8,6 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
-import com.liquidnet.service.goblin.dto.GoblinQueueBizArtworkGenDto;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.GoblinNftOrder;
 import com.liquidnet.service.goblin.param.GoblinNftOrderPayAgainParam;
@@ -674,7 +673,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                 // 增加销量
                 goblinRedisUtils.incrSkuSaleCount(orderVo.getSpuId(), orderVo.getSkuId(), orderVo.getNum());
                 // 加积分
-                goblinOrderUtils.doTask(uid, orderVo.getPriceActual());
+                goblinOrderUtils.integral(uid, orderVo.getPriceActual(), "藏品购买", 1);
             }
             // 写入用户订单列表 因取消的订单不展示 所以放在这里
             nftOrderUtils.addNftOrderList(uid, orderVo.getOrderId());
@@ -740,7 +739,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_NFT_ORDER.getKey(),
                     SqlMapping.gets(sqls, sqlsOrder, sqlsBackOrder));
             //减积分
-            goblinOrderUtils.desTask(nftOrder.getUserId(), nftOrderRefundVo.getPrice());
+            goblinOrderUtils.integral(nftOrder.getUserId(), nftOrderRefundVo.getPrice(), "藏品退款", 2);
         } else if (0 == status) {
             log.info("NftRefundCallback: 支付平台返回状态为失败，编号{}", refundCallbackParam.getOrderRefundCode());
             return "fail";

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -871,7 +871,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
 //            }
             //加分
             if (orderUtils.noZhengzaiOrder(uid)) {
-                orderUtils.doTask(uid, priceActual);
+                orderUtils.integral(uid, priceActual, "购买商品", 1);
             }
         }
         return "success";
@@ -1029,7 +1029,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
                     SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku, sqlsBackOrder));
             //减积分
-            orderUtils.desTask(orderVo.getUserId(), backOrderVo.getRealBackPrice());
+            orderUtils.integral(orderVo.getUserId(), backOrderVo.getRealBackPrice(), "商品退款", 2);
         } else if (0 == status) {
             return "fail";
         }
@@ -1153,7 +1153,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 }
                 //加分
                 if (orderUtils.noZhengzaiOrder(uid)) {
-                    orderUtils.doTask(uid, priceActual);
+                    orderUtils.integral(uid, priceActual, "购买商品", 1);
                 }
             } else {
                 // 业务处理失败

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinOrderUtils.java

@@ -10,6 +10,7 @@ import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.candy.vo.CandyUseResultVo;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
+import com.liquidnet.service.goblin.dto.GoblinQueueBizIntegralDto;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.GoblinBackOrder;
 import com.liquidnet.service.goblin.entity.GoblinBackOrderLog;
@@ -30,12 +31,8 @@ import java.util.List;
 @Slf4j
 public class GoblinOrderUtils {
 
-    @Value("${liquidnet.service.adam.url}")
-    private String adamUrl;
     @Value("${liquidnet.service.candy.url}")
     private String candyUrl;
-    @Value("${liquidnet.service.stone.url}")
-    private String stoneUrl;
     @Value("${liquidnet.service.order.url-pay.goblinRefundUrl}")
     private String synUrl;
     @Value("${liquidnet.service.dragon.urls.refundApply}")
@@ -212,33 +209,14 @@ public class GoblinOrderUtils {
         }
     }
 
-    public void doTask(String uid, BigDecimal price) {
-        try {
-            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
-            header.add("Accept", "application/json;charset=UTF-8");
-            MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
-            params.add("score", price.intValue() + "");
-            params.add("content", "购买商品:");
-            params.add("uid", uid);
-            String resultData = HttpUtil.post(stoneUrl + "/user/logs/in2111", params, header);
-        } catch (Exception e) {
-            log.error("添加积分失败,e:{}", e);
-            e.printStackTrace();
-        }
-    }
-
-    public void desTask(String uid, BigDecimal price) {
-        try {
-            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
-            header.add("Accept", "application/json;charset=UTF-8");
-            MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
-            params.add("score", price.intValue() + "");
-            params.add("content", "购买商品:");
-            params.add("uid", uid);
-            String resultData = HttpUtil.post(stoneUrl + "/user/logs/de2111", params, header);
-        } catch (Exception e) {
-            log.error("添加积分失败,e:{}", e);
-            e.printStackTrace();
+    public void integral(String uid, BigDecimal price, String content, int type) {
+        if (price.compareTo(BigDecimal.ZERO) > 0) {
+            GoblinQueueBizIntegralDto goblinQueueBizIntegralDto = GoblinQueueBizIntegralDto.getNew();
+            goblinQueueBizIntegralDto.setUid(uid);
+            goblinQueueBizIntegralDto.setScore(price);
+            goblinQueueBizIntegralDto.setContent(content);
+            goblinQueueBizIntegralDto.setType(type);
+            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.BIZ_INTEGRAL.getKey(), goblinQueueBizIntegralDto.toJson());
         }
     }