修改线上恶性bug

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

@@ -112,6 +112,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     skuAndPreListAndNumber.add(skuId + "," + pre + "," + number);
                     // 判断库存
                     GoblinGoodsSkuInfoVo skuVo = redisUtils.getGoodsSkuInfoVo(skuParam.getSkuId());
+                    if(!skuParam.getSpuId().equals(skuVo.getSpuId())){
+                        throw new Exception("参数异常");
+                    }
                     int limitCount = skuVo.getBuyLimit() == 0 ? Integer.MAX_VALUE : skuVo.getBuyLimit();
                     //判断限购
                     if (orderUtils.noZhengzaiOrder(uid)) {
@@ -423,13 +426,13 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         String payCode;
         if (preParam.getPriceActual().compareTo(BigDecimal.valueOf(0)) > 0 && !preParam.getPayType().equals("huifu")) {
             // 调用支付
-            if (preParam.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
-                if (preParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || preParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
-                    if (StringUtil.isEmpty(preParam.getOpenId())) {
-                        return ResponseDto.failure("微信支付openId不能为空!");
-                    }
-                }
-            }
+//            if (preParam.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
+//                if (preParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || preParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
+//                    if (StringUtil.isEmpty(preParam.getOpenId())) {
+//                        return ResponseDto.failure("微信支付openId不能为空!");
+//                    }
+//                }
+//            }
             DragonPayBaseReqDto dragonPayBaseReqDto = DragonPayBaseReqDto.getNew();
             dragonPayBaseReqDto.setPayType(preParam.getPayType());
             dragonPayBaseReqDto.setDeviceFrom(preParam.getDeviceFrom());

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

@@ -665,14 +665,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             if (name.equals("")) {
                 name = "正在现场";
             }
-            // 调用支付
-            if (payOrderParam.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
-                if (payOrderParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || payOrderParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
-                    if (StringUtil.isEmpty(payOrderParam.getOpenId())) {
-                        return ResponseDto.failure("微信支付openId不能为空!");
-                    }
-                }
-            }
+//            // 调用支付
+//            if (payOrderParam.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
+//                if (payOrderParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || payOrderParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
+//                    if (StringUtil.isEmpty(payOrderParam.getOpenId())) {
+//                        return ResponseDto.failure("微信支付openId不能为空!");
+//                    }
+//                }
+//            }
             DragonPayBaseReqDto dragonPayBaseReqDto = DragonPayBaseReqDto.getNew();
             dragonPayBaseReqDto.setPayType(payOrderParam.getPayType());
             dragonPayBaseReqDto.setDeviceFrom(payOrderParam.getDeviceFrom());
@@ -795,13 +795,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 if (name.equals("")) {
                     name = "正在现场";
                 }
-                if (payAgainParam.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
-                    if (payAgainParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || payAgainParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
-                        if (StringUtil.isEmpty(payAgainParam.getOpenId())) {
-                            return ResponseDto.failure("微信支付openId不能为空!");
-                        }
-                    }
-                }
+//                if (payAgainParam.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
+//                    if (payAgainParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || payAgainParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
+//                        if (StringUtil.isEmpty(payAgainParam.getOpenId())) {
+//                            return ResponseDto.failure("微信支付openId不能为空!");
+//                        }
+//                    }
+//                }
                 DragonPayBaseReqDto dragonPayBaseReqDto = DragonPayBaseReqDto.getNew();
                 dragonPayBaseReqDto.setPayType(payAgainParam.getPayType());
                 dragonPayBaseReqDto.setDeviceFrom(payAgainParam.getDeviceFrom());