修改 再次支付

修改 redis获取vo

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

@@ -103,9 +103,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             AdamAddressesVo addressesVo;
             boolean isMember;
             if (userVo == null) {
-                if(noZhengzaiOrder(uid)) {
+                if (noZhengzaiOrder(uid)) {
                     throw new Exception("库存不足");
-                }else{
+                } else {
                     isMember = false;
                     addressesVo = null;
                 }
@@ -477,7 +477,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             payCode = payInnerResultVo.getCode();
             payInnerResultVo.setShowUrl(preParam.getShowUrl());
             payInnerResultVo.setReturnUrl(preParam.getReturnUrl());
-        }else if(preParam.getPayType()==null){
+        } else if (preParam.getPayType() == null) {
             isFree = true;
             preParam.setPayType("FREE");
             payCode = "FREE_PAY_CODE";
@@ -632,7 +632,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             httpData.add("notifyUrl", synUrl);
             httpData.add("createDate", storeOrderVo.getCreatedAt());
             httpData.add("expireTime", storeOrderVo.getPayCountdownMinute().toString());
-            httpData.add("payType", storeOrderVo.getPayType());
+            httpData.add("payType", param.getPayType());
             httpData.add("deviceFrom", param.getDeviceFrom());
             if (param.getDeviceFrom().equals("js") || param.getDeviceFrom().equals("applet")) {
                 httpData.add("openId", param.getOpenId());
@@ -649,18 +649,25 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getOrderId());
             }
             String returnData = HttpUtil.post(payUrl, httpData);
-            log.info("调用 DRAGON 结果 = " + returnData);
+            log.debug("调用 DRAGON 结果 = " + returnData);
             ResponseDto<GoblinPayInnerResultVo> dto = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<GoblinPayInnerResultVo>>() {
             });
             payInnerResultVo.setCode(dto.getData().getCode());
             payInnerResultVo.setOrderCode(dto.getData().getOrderCode());
             payInnerResultVo.setPayData(dto.getData().getPayData());
             payInnerResultVo.setOrderId(storeOrderVo.getOrderId());
-            payInnerResultVo.setPayType(storeOrderVo.getPayType());
+            payInnerResultVo.setPayType(param.getPayType());
             payInnerResultVo.setPrice(storeOrderVo.getPriceActual());
             storeOrderVo.setPayCode(payInnerResultVo.getCode());
             payInnerResultVo.setShowUrl(param.getShowUrl() + storeOrderVo.getOrderId());
             payInnerResultVo.setReturnUrl(param.getReturnUrl() + storeOrderVo.getOrderId());
+            //redis
+            storeOrderVo.setPayType(param.getPayType());
+            storeOrderVo.setDeviceFrom(param.getDeviceFrom());
+            storeOrderVo.setPayCode(payInnerResultVo.getCode());
+            redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo);
+            //mongo
+            mongoUtils.updateGoblinStoreOrderVo(storeOrderVo.getOrderId(), storeOrderVo);
             //mysql
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_AGAIN.getKey(),
                     SqlMapping.get("goblin_order.pay.again", param.getPayType(), param.getDeviceFrom(), payInnerResultVo.getCode(), param.getOrderId(), now, now));

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

@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.RandomUtil;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
+import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.GoblinStoreMarketDto;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinMgtCategorySpecVo;
 import com.liquidnet.service.goblin.dto.vo.*;
@@ -69,17 +70,43 @@ public class GoblinRedisUtils {
      * @return GoblinGoodsInfoVo
      */
     public GoblinGoodsInfoVo getGoodsInfoVo(String spuId) {
+        String pre = GoblinStatusConst.MarketPreStatus.getPre(spuId);
+        if (pre != null && pre.equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())) {
+            String rk = GoblinRedisConst.BASIC_GOODS.concat(spuId.split(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())[0]);
+            GoblinGoodsInfoVo vo = (GoblinGoodsInfoVo) redisUtil.get(rk);
+            if (null == vo && null != (vo = goblinMongoUtils.getGoodsInfoVo(spuId))) {
+                redisUtil.set(rk, vo);
+            }
+            if (vo == null) {
+                return vo;
+            }
+            String marketrk = GoblinRedisConst.BASIC_GOODS.concat(spuId);
+            GoblinGoodsInfoVo marketVo = (GoblinGoodsInfoVo) redisUtil.get(marketrk);
+            if (null == marketVo && null != (marketVo = goblinMongoUtils.getGoodsInfoVo(spuId))) {
+                redisUtil.set(marketrk, marketVo);
+            }
+            if (marketVo == null) {
+                return marketVo;
+            }
+            vo.setSpuId(marketVo.getSpuId());
+            List<String> skuIdList = CollectionUtil.linkedListString();
+            for (String skuIds : vo.getSkuIdList()) {
+                skuIdList.add(skuIds.concat(spuId.split(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())[1]));
+            }
+            vo.setSkuIdList(skuIdList);
+            vo.setPriceGe(marketVo.getPriceGe());
+            vo.setPriceLe(marketVo.getPriceLe());
+            vo.setMarketId(marketVo.getMarketId());
+            return vo;
+        } else {
             String rk = GoblinRedisConst.BASIC_GOODS.concat(spuId);
             GoblinGoodsInfoVo vo = (GoblinGoodsInfoVo) redisUtil.get(rk);
             if (null == vo && null != (vo = goblinMongoUtils.getGoodsInfoVo(spuId))) {
-//            if (vo.getShelvesStatus().equals("3")) {
                 redisUtil.set(rk, vo);
-//            } else {
-//                vo = null;
-//            }
             }
             return vo;
         }
+    }
 
     /**
      * 单品信息
@@ -88,17 +115,46 @@ public class GoblinRedisUtils {
      * @return GoblinGoodsSkuInfoVo
      */
     public GoblinGoodsSkuInfoVo getGoodsSkuInfoVo(String skuId) {
+        String pre = GoblinStatusConst.MarketPreStatus.getPre(skuId);
+        if (pre != null && pre.equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())) {
+            String rk = GoblinRedisConst.BASIC_GOODS_SKU.concat(skuId.split(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())[0]);
+            GoblinGoodsSkuInfoVo vo = (GoblinGoodsSkuInfoVo) redisUtil.get(rk);
+            if (null == vo && null != (vo = goblinMongoUtils.getGoodsSkuInfoVo(skuId))) {
+                redisUtil.set(rk, vo);
+            }
+            if (vo == null) {
+                return vo;
+            }
+            String marketrk = GoblinRedisConst.BASIC_GOODS_SKU.concat(skuId);
+            GoblinGoodsSkuInfoVo marketVo = (GoblinGoodsSkuInfoVo) redisUtil.get(marketrk);
+            if (null == marketVo && null != (marketVo = goblinMongoUtils.getGoodsSkuInfoVo(skuId))) {
+                redisUtil.set(marketrk, marketVo);
+            }
+            if (marketVo == null) {
+                return marketVo;
+            }
+
+            vo.setSpuId(marketVo.getSpuId());
+            vo.setSkuId(marketVo.getSkuId());
+            vo.setPrice(marketVo.getPrice());
+            vo.setPriceMember(marketVo.getPriceMember());
+            vo.setSkuStock(marketVo.getSkuStock());
+            vo.setBuyLimit(marketVo.getBuyLimit());
+            vo.setBuyRoster(marketVo.getBuyRoster());
+            vo.setBuyFactor(marketVo.getBuyFactor());
+            vo.setDelFlg("0");
+            vo.setMarketId(marketVo.getMarketId());
+            vo.setCreatedAt(LocalDateTime.now());
+            return vo;
+        } else {
             String rk = GoblinRedisConst.BASIC_GOODS_SKU.concat(skuId);
             GoblinGoodsSkuInfoVo vo = (GoblinGoodsSkuInfoVo) redisUtil.get(rk);
             if (null == vo && null != (vo = goblinMongoUtils.getGoodsSkuInfoVo(skuId))) {
-//            if (vo.getShelvesStatus().equals("3")) {
                 redisUtil.set(rk, vo);
-//            } else {
-//                vo = null;
-//            }
             }
             return vo;
         }
+    }
 
     //获取 用户sku购买个数
     public Integer getSkuCountByUid(String uid, String skuId) {