Merge branch 'pre' into 'master'

Pre

See merge request !280

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

@@ -139,8 +139,8 @@ liquidnet:
       xuper:
         nftApiUrl: http://120.48.16.137:8360
         appId: 110353
-        accessKeyID: 44b69914377ed77613824781da9e8653
-        secretAccessKey: 99b946f9dba244e7a3d5bc7a1862ef39
+        accessKeyID: 4e99daf33303efc8c822daa90c925389
+        secretAccessKey: ac77c0e94424edd98ea8a23b342e877a
         nftPlatformMnemonic: person lucky trophy wall kangaroo body bounce coach unable sister second goat guitar virus tree security acoustic ankle kiss deputy sunny message weapon believe
         nftPlatformAddress: YqsYxgBSP74piDhNQHTjWMH9wXnXxZbt8
     other:

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

@@ -139,8 +139,8 @@ liquidnet:
       xuper:
         nftApiUrl: http://120.48.16.137:8360
         appId: 110353
-        accessKeyID: 44b69914377ed77613824781da9e8653
-        secretAccessKey: 99b946f9dba244e7a3d5bc7a1862ef39
+        accessKeyID: 4e99daf33303efc8c822daa90c925389
+        secretAccessKey: ac77c0e94424edd98ea8a23b342e877a
         nftPlatformMnemonic: person lucky trophy wall kangaroo body bounce coach unable sister second goat guitar virus tree security acoustic ankle kiss deputy sunny message weapon believe
         nftPlatformAddress: YqsYxgBSP74piDhNQHTjWMH9wXnXxZbt8
     other:

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

@@ -23,6 +23,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.redis.connection.stream.MapRecord;
 import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -293,7 +294,10 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
                         vo.setState(1);
                         vo.setUsedFor("");
                         setUserCouponVos(params.getUid(), voList);
-                        changeCouponVos(vo.getUcouponId(), vo);
+                        GoblinUserCouponBasicVo basicVo = GoblinUserCouponBasicVo.getNew();
+                        basicVo.setState(1);
+                        basicVo.setUsedFor("");
+                        changeCouponVos(vo.getUcouponId(), basicVo);
                         sendMsgByRedis(MQConst.GoblinQueue.SQL_COUPON.getKey(),
                                 SqlMapping.get("goblin_user_coupon.updateState", vo.getState(), vo.getUsedFor(), LocalDateTime.now(), vo.getUcouponId()));
                     }
@@ -337,11 +341,13 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
         return vos;
     }
 
-    public Boolean changeCouponVos(String ucouponId, GoblinUserCouponVo vo) {
-        return mongoTemplate.getCollection(GoblinUserCouponVo.class.getSimpleName())
-                .updateOne(Query.query(Criteria.where("ucouponId").is(ucouponId)).getQueryObject(),
-                        cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(vo))
-                ).getModifiedCount() > 0;
+    public Boolean changeCouponVos(String ucouponId, GoblinUserCouponBasicVo vo) {
+        return mongoTemplate.getCollection(GoblinUserCouponBasicVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("ucouponId").is(ucouponId)).getQueryObject(),
+                Update.update("state", vo.getState())
+                        .set("usedFor", vo.getUsedFor())
+                        .getUpdateObject()
+        ).getModifiedCount() > 0;
     }
 
     public boolean setUserCouponVos(String uid, List<GoblinUserCouponVo> vos) {

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/src/main/java/com/liquidnet/service/consumer/order/receiver/AbstractOrderCloseReceiver.java

@@ -32,6 +32,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.redis.connection.stream.MapRecord;
 import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -495,7 +496,10 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
                         vo.setState(1);
                         vo.setUsedFor("");
                         setUserCouponVos(params.getUid(), voList);
-                        changeCouponVos(vo.getUcouponId(), vo);
+                        GoblinUserCouponBasicVo basicVo = GoblinUserCouponBasicVo.getNew();
+                        basicVo.setState(1);
+                        basicVo.setUsedFor("");
+                        changeCouponVos(vo.getUcouponId(), basicVo);
                         sendMsgByRedis(MQConst.GoblinQueue.SQL_COUPON.getKey(),
                                 SqlMapping.get("goblin_user_coupon.updateState", vo.getState(), vo.getUsedFor(), LocalDateTime.now(), vo.getUcouponId()));
                     }
@@ -545,11 +549,13 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
         return (int) redisUtil.decr(rdk, 1);
     }
 
-    public Boolean changeCouponVos(String ucouponId, GoblinUserCouponVo vo) {
-        return mongoTemplate.getCollection(GoblinUserCouponVo.class.getSimpleName())
-                .updateOne(Query.query(Criteria.where("ucouponId").is(ucouponId)).getQueryObject(),
-                        cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(vo))
-                ).getModifiedCount() > 0;
+    public Boolean changeCouponVos(String ucouponId, GoblinUserCouponBasicVo vo) {
+        return mongoTemplate.getCollection(GoblinUserCouponBasicVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("ucouponId").is(ucouponId)).getQueryObject(),
+                Update.update("state", vo.getState())
+                        .set("usedFor", vo.getUsedFor())
+                        .getUpdateObject()
+        ).getModifiedCount() > 0;
     }
 
     public boolean setUserCouponVos(String uid, List<GoblinUserCouponVo> vos) {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/router/xuper/biz/XuperTradeCommonBiz.java

@@ -573,7 +573,7 @@ public class XuperTradeCommonBiz {
             GalaxyNftPublishResultQueryRespDto nftPublishResultQueryRespDto = GalaxyNftPublishResultQueryRespDto.getNew();
             nftPublishResultQueryRespDto.setNftIdBegin(nftOrderBo.getNftId());
             nftPublishResultQueryRespDto.setTaskMsg(nftOrderBo.getNftId());
-            nftPublishResultQueryRespDto.setTxHash(nftOrderBo.getNftPublishTradeHash());
+            nftPublishResultQueryRespDto.setTxHash(assetMeta.getTxId());
             nftPublishResultQueryRespDto.setChainTimestamp(nftPublishChainTimestampStr);
             nftPublishResultQueryRespDto.setTaskStatus(Integer.valueOf(nftPublishStatusStr));
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/galaxy/router/xuper/biz/XuperArtworkBiz.java

@@ -342,7 +342,7 @@ public class XuperArtworkBiz {
             log.error("sys error msg "+e.getMessage(),e);
         }
         log.info("seriesClaimResultQuery resp : "+ JsonUtils.toJson(respDto));
-        if(respDto.getErrNo() == Integer.parseInt(ErrorCode.SUCCESS.getCode())){
+        if(StringUtil.isNotNull(respDto)&&respDto.getErrNo() == Integer.parseInt(ErrorCode.SUCCESS.getCode())){
             if(respDto.getMeta().getStatus() == Integer.parseInt(XuperEnum.AssetPublishStatusEnum.INIT.getCode())){
                 //设置系列声明状态
                 seriesInfoBo.setSeriesClaimStatus(GalaxyEnum.SeriesClaimStatusEnum.SUCCESS.getCode());

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinCouponImpl.java

@@ -345,7 +345,10 @@ public class GoblinCouponImpl implements GoblinCouponService {
                         }
                         vo.setState(5);
                         vo.setUsedFor(content);
-                        goblinMongoUtils.changeCouponVos(vo.getUcouponId(), vo);
+                        GoblinUserCouponBasicVo basicVo = GoblinUserCouponBasicVo.getNew();
+                        basicVo.setState(5);
+                        basicVo.setUsedFor(content);
+                        goblinMongoUtils.changeCouponVos(vo.getUcouponId(), basicVo);
                         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_COUPON.getKey(),
                                 SqlMapping.get("goblin_user_coupon.updateState", vo.getState(), vo.getUsedFor(), LocalDateTime.now(), vo.getUcouponId()));
                         break;
@@ -374,7 +377,10 @@ public class GoblinCouponImpl implements GoblinCouponService {
                                 }
                                 vo.setState(5);
                                 vo.setUsedFor(content);
-                                goblinMongoUtils.changeCouponVos(vo.getUcouponId(), vo);
+                                GoblinUserCouponBasicVo basicVo = GoblinUserCouponBasicVo.getNew();
+                                basicVo.setState(5);
+                                basicVo.setUsedFor(content);
+                                goblinMongoUtils.changeCouponVos(vo.getUcouponId(), basicVo);
                                 queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_COUPON.getKey(),
                                         SqlMapping.get("goblin_user_coupon.updateState", vo.getState(), vo.getUsedFor(), LocalDateTime.now(), vo.getUcouponId()));
                             }
@@ -402,7 +408,10 @@ public class GoblinCouponImpl implements GoblinCouponService {
                             vo.setState(1);
                             vo.setUsedFor("");
                             goblinRedisUtils.setUserCouponVos(item.getUid(), voList);
-                            goblinMongoUtils.changeCouponVos(vo.getUcouponId(), vo);
+                            GoblinUserCouponBasicVo basicVo = GoblinUserCouponBasicVo.getNew();
+                            basicVo.setState(1);
+                            basicVo.setUsedFor("");
+                            goblinMongoUtils.changeCouponVos(vo.getUcouponId(), basicVo);
                             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_COUPON.getKey(),
                                     SqlMapping.get("goblin_user_coupon.updateState", vo.getState(), vo.getUsedFor(), LocalDateTime.now(), vo.getUcouponId()));
                         }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinUserDigitalArtworkServiceImpl.java

@@ -358,36 +358,40 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 
     private void updateUserDigitalArtworkByChainTrade(GoblinUserDigitalArtworkVo userDigitalArtworkVo, GoblinUserDigitalArtworkListVo listVo,
                                                       String routerType, LocalDateTime now) {
-        GalaxyNftPublishAndBuyResultQueryReqDto nftTradeQueryReqDto = GalaxyNftPublishAndBuyResultQueryReqDto.getNew();
-        nftTradeQueryReqDto.setUserId(userDigitalArtworkVo.getUid());
-        nftTradeQueryReqDto.setNftOrderPayId(userDigitalArtworkVo.getOrderId());
-        nftTradeQueryReqDto.setRouterType(routerType);
-        ResponseDto<GalaxyNftPublishAndBuyResultQueryRespDto> nftTradeQueryRespDto = galaxyTradeService.nftPublishAndBuyResultQuery(nftTradeQueryReqDto);
-        if (nftTradeQueryRespDto.isSuccess()) {
-            GalaxyNftPublishAndBuyResultQueryRespDto nftTradeQueryRespDtoData = nftTradeQueryRespDto.getData();
-            String nftId = nftTradeQueryRespDtoData.getNftId();
-
-            listVo.setState(1);
-            listVo.setEditionSn(Integer.valueOf(nftId.substring(nftId.indexOf("_") + 1)));
-
-            userDigitalArtworkVo.setEditionSn(listVo.getEditionSn());
-            userDigitalArtworkVo.setNftId(nftId);
-            userDigitalArtworkVo.setReleaseAt(nftTradeQueryRespDtoData.getNftPublishChainTimestamp());
-            userDigitalArtworkVo.setReleaseTxhash(nftTradeQueryRespDtoData.getNftPublishTradeHash());
-            userDigitalArtworkVo.setTradingAt(nftTradeQueryRespDtoData.getNftBuyChainTimestamp());
-            userDigitalArtworkVo.setTradingTxhash(nftTradeQueryRespDtoData.getNftBuyTradeHash());
-            userDigitalArtworkVo.setState(1);
-            userDigitalArtworkVo.setUpdatedAt(now);
-
-            goblinRedisUtils.setUserDigitalArtworkVo(userDigitalArtworkVo);
-            goblinMongoUtils.updateUserDigitalArtworkVoByChainTrade(userDigitalArtworkVo);
-
-            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_ARTWORK_GEN.getKey(),
-                    SqlMapping.get("goblin_user_digital_artwork.update_for_chain",
-                            userDigitalArtworkVo.getEditionSn(), userDigitalArtworkVo.getNftId(), userDigitalArtworkVo.getReleaseTxhash(),
-                            userDigitalArtworkVo.getReleaseAt(), userDigitalArtworkVo.getTradingTxhash(), userDigitalArtworkVo.getTradingAt(),
-                            userDigitalArtworkVo.getState(), userDigitalArtworkVo.getUpdatedAt(), userDigitalArtworkVo.getArtworkId())
-            );
+        try {
+            GalaxyNftPublishAndBuyResultQueryReqDto nftTradeQueryReqDto = GalaxyNftPublishAndBuyResultQueryReqDto.getNew();
+            nftTradeQueryReqDto.setUserId(userDigitalArtworkVo.getUid());
+            nftTradeQueryReqDto.setNftOrderPayId(userDigitalArtworkVo.getOrderId());
+            nftTradeQueryReqDto.setRouterType(routerType);
+            ResponseDto<GalaxyNftPublishAndBuyResultQueryRespDto> nftTradeQueryRespDto = galaxyTradeService.nftPublishAndBuyResultQuery(nftTradeQueryReqDto);
+            if (nftTradeQueryRespDto.isSuccess()) {
+                GalaxyNftPublishAndBuyResultQueryRespDto nftTradeQueryRespDtoData = nftTradeQueryRespDto.getData();
+                String nftId = nftTradeQueryRespDtoData.getNftId();
+
+                listVo.setState(1);
+                listVo.setEditionSn(Integer.valueOf(nftId.substring(nftId.indexOf("_") + 1)));
+
+                userDigitalArtworkVo.setEditionSn(listVo.getEditionSn());
+                userDigitalArtworkVo.setNftId(nftId);
+                userDigitalArtworkVo.setReleaseAt(nftTradeQueryRespDtoData.getNftPublishChainTimestamp());
+                userDigitalArtworkVo.setReleaseTxhash(nftTradeQueryRespDtoData.getNftPublishTradeHash());
+                userDigitalArtworkVo.setTradingAt(nftTradeQueryRespDtoData.getNftBuyChainTimestamp());
+                userDigitalArtworkVo.setTradingTxhash(nftTradeQueryRespDtoData.getNftBuyTradeHash());
+                userDigitalArtworkVo.setState(1);
+                userDigitalArtworkVo.setUpdatedAt(now);
+
+                goblinRedisUtils.setUserDigitalArtworkVo(userDigitalArtworkVo);
+                goblinMongoUtils.updateUserDigitalArtworkVoByChainTrade(userDigitalArtworkVo);
+
+                queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_ARTWORK_GEN.getKey(),
+                        SqlMapping.get("goblin_user_digital_artwork.update_for_chain",
+                                userDigitalArtworkVo.getEditionSn(), userDigitalArtworkVo.getNftId(), userDigitalArtworkVo.getReleaseTxhash(),
+                                userDigitalArtworkVo.getReleaseAt(), userDigitalArtworkVo.getTradingTxhash(), userDigitalArtworkVo.getTradingAt(),
+                                userDigitalArtworkVo.getState(), userDigitalArtworkVo.getUpdatedAt(), userDigitalArtworkVo.getArtworkId())
+                );
+            }
+        } catch (NumberFormatException e) {
+            log.error("Ex.我的藏品列表:藏品上链结果查询处理失败[uid={},orderId={}]", userDigitalArtworkVo.getUid(), userDigitalArtworkVo.getOrderId(), e);
         }
     }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -1567,11 +1567,13 @@ public class GoblinMongoUtils {
         return mongoTemplate.insert(vo, GoblinUserCouponBasicVo.class.getSimpleName());
     }
 
-    public Boolean changeCouponVos(String ucouponId, GoblinUserCouponVo vo) {
-        return mongoTemplate.getCollection(GoblinUserCouponVo.class.getSimpleName())
-                .updateOne(Query.query(Criteria.where("ucouponId").is(ucouponId)).getQueryObject(),
-                        ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(vo))
-                ).getModifiedCount() > 0;
+    public Boolean changeCouponVos(String ucouponId, GoblinUserCouponBasicVo vo) {
+        return mongoTemplate.getCollection(GoblinUserCouponBasicVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("ucouponId").is(ucouponId)).getQueryObject(),
+                Update.update("state", vo.getState())
+                        .set("usedFor", vo.getUsedFor())
+                        .getUpdateObject()
+        ).getModifiedCount() > 0;
     }
 
     /* ---------------------------------------- 我的藏品 ---------------------------------------- */

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

@@ -8,6 +8,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -43,6 +44,7 @@ public class GoblinMongoUtils {
     public GoblinStoreOrderVo insertGoblinStoreOrderVo(GoblinStoreOrderVo vo) {
         return mongoTemplate.insert(vo, GoblinStoreOrderVo.class.getSimpleName());
     }
+
     public void insertGoblinStoreOrderVos(List<GoblinStoreOrderVo> vos) {
         mongoTemplate.insert(vos, GoblinStoreOrderVo.class.getSimpleName());
     }
@@ -89,11 +91,13 @@ public class GoblinMongoUtils {
         return mongoTemplate.findOne(Query.query(Criteria.where("backCode").is(backCode)), GoblinBackOrderVo.class, GoblinBackOrderVo.class.getSimpleName());
     }
 
-    public Boolean changeCouponVos(String ucouponId, GoblinUserCouponVo vo) {
-        return mongoTemplate.getCollection(GoblinUserCouponVo.class.getSimpleName())
-                .updateOne(Query.query(Criteria.where("ucouponId").is(ucouponId)).getQueryObject(),
-                        ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(vo))
-                ).getModifiedCount() > 0;
+    public Boolean changeCouponVos(String ucouponId, GoblinUserCouponBasicVo vo) {
+        return mongoTemplate.getCollection(GoblinUserCouponBasicVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("ucouponId").is(ucouponId)).getQueryObject(),
+                Update.update("state", vo.getState())
+                        .set("usedFor", vo.getUsedFor())
+                        .getUpdateObject()
+        ).getModifiedCount() > 0;
     }
 
     public GoblinStoreCouponBasicVo getMgtStoreCouponBasicVo(String storeCouponId) {
@@ -126,10 +130,12 @@ public class GoblinMongoUtils {
     public GoblinNftOrderRefundVo insertGoblinNftOrderRefundVo(GoblinNftOrderRefundVo vo) {
         return mongoTemplate.insert(vo, GoblinNftOrderRefundVo.class.getSimpleName());
     }
+
     //获取 订单退款数据
     public GoblinNftOrderRefundVo getGoblinNftOrderRefundVo(String refundCode) {
         return mongoTemplate.findOne(Query.query(Criteria.where("refundCode").is(refundCode)), GoblinNftOrderRefundVo.class, GoblinNftOrderRefundVo.class.getSimpleName());
     }
+
     //修改 订单退款数据
     public UpdateResult updateGoblinNftOrderRefundVo(String orderRefundId, HashMap<String, Object> data) {
         return mongoTemplate.getCollection(GoblinNftOrderRefundVo.class.getSimpleName()).updateOne(

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

@@ -310,7 +310,10 @@ public class GoblinNftOrderUtils {
                     // 更新券信息
                     vo.setState(5);
                     vo.setUsedFor(content);
-                    goblinMongoUtils.changeCouponVos(vo.getUcouponId(), vo);
+                    GoblinUserCouponBasicVo basicVo = GoblinUserCouponBasicVo.getNew();
+                    basicVo.setState(5);
+                    basicVo.setUsedFor(content);
+                    goblinMongoUtils.changeCouponVos(vo.getUcouponId(), basicVo);
                     queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_COUPON.getKey(),
                             SqlMapping.get("goblin_user_coupon.updateState", vo.getState(), vo.getUsedFor(), LocalDateTime.now(), vo.getUcouponId()));
                 }

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

@@ -273,7 +273,10 @@ public class GoblinOrderUtils {
                             }
                             vo.setState(5);
                             vo.setUsedFor(content);
-                            goblinMongoUtils.changeCouponVos(vo.getUcouponId(), vo);
+                            GoblinUserCouponBasicVo basicVo = GoblinUserCouponBasicVo.getNew();
+                            basicVo.setState(5);
+                            basicVo.setUsedFor(content);
+                            goblinMongoUtils.changeCouponVos(vo.getUcouponId(), basicVo);
                             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_COUPON.getKey(),
                                     SqlMapping.get("goblin_user_coupon.updateState", vo.getState(), vo.getUsedFor(), LocalDateTime.now(), vo.getUcouponId()));
                             break;
@@ -321,7 +324,10 @@ public class GoblinOrderUtils {
                                 }
                                 vo.setState(5);
                                 vo.setUsedFor(content);
-                                goblinMongoUtils.changeCouponVos(vo.getUcouponId(), vo);
+                                GoblinUserCouponBasicVo basicVo = GoblinUserCouponBasicVo.getNew();
+                                basicVo.setState(5);
+                                basicVo.setUsedFor(content);
+                                goblinMongoUtils.changeCouponVos(vo.getUcouponId(), basicVo);
                                 queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_COUPON.getKey(),
                                         SqlMapping.get("goblin_user_coupon.updateState", vo.getState(), vo.getUsedFor(), LocalDateTime.now(), vo.getUcouponId()));
                             }
@@ -352,7 +358,10 @@ public class GoblinOrderUtils {
                             vo.setState(1);
                             vo.setUsedFor("");
                             redisUtils.setUserCouponVos(item.getUid(), voList);
-                            goblinMongoUtils.changeCouponVos(vo.getUcouponId(), vo);
+                            GoblinUserCouponBasicVo basicVo = GoblinUserCouponBasicVo.getNew();
+                            basicVo.setState(1);
+                            basicVo.setUsedFor("");
+                            goblinMongoUtils.changeCouponVos(vo.getUcouponId(), basicVo);
                             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_COUPON.getKey(),
                                     SqlMapping.get("goblin_user_coupon.updateState", vo.getState(), vo.getUsedFor(), LocalDateTime.now(), vo.getUcouponId()));
                         }