所有支付类型都 返回 url

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

@@ -444,6 +444,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             if (preParam.getPayType().equals("unionpay")) {
                 httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
             }
+            httpData.add("showUrl", preParam.getShowUrl() + preParam.getOrderMasterCode());
+            httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
             LinkedMultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
             header.add("Accept", "application/json;charset=UTF-8");
             String returnData = HttpUtil.post(payUrl, httpData, header);
@@ -641,6 +643,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             httpData.add("expireTime", storeOrderVo.getPayCountdownMinute().toString());
             httpData.add("payType", param.getPayType());
             httpData.add("deviceFrom", param.getDeviceFrom());
+
             if (param.getDeviceFrom().equals("js") || param.getDeviceFrom().equals("applet")) {
                 httpData.add("openId", param.getOpenId());
             }
@@ -655,6 +658,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             if (param.getPayType().equals("unionpay")) {
                 httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
             }
+            httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getMasterOrderCode());
+            httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
             String returnData = HttpUtil.post(payUrl, httpData);
             log.debug("调用 DRAGON 结果 = " + returnData);
             ResponseDto<GoblinPayInnerResultVo> dto = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<GoblinPayInnerResultVo>>() {

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

@@ -56,7 +56,7 @@ public class GoblinOrderUtils {
     public String judgeOrderLimit(String uid, String skuId, int number, int limitCount) {
         int buyCount = redisUtils.incrSkuCountByUid(uid, skuId, number);
         if (buyCount  > limitCount) {
-            redisUtils.decrSkuCountByUid(uid, skuId, number);
+//            redisUtils.decrSkuCountByUid(uid, skuId, number);
             return "已超出限购数量";
         } else {
             return "";