修改 商品再次支付

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

@@ -709,17 +709,17 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
 //        } else
         if (!storeOrderVo.getPayType().equals("FREE")) {
             // 调用支付
-            if (param.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
-                if (param.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || param.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
-                    if (StringUtil.isEmpty(param.getOpenId())) {
-                        return ResponseDto.failure("微信支付openId不能为空!");
-                    }
-                }
-            }
+//            if (param.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
+//                if (param.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || param.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
+//                    if (StringUtil.isEmpty(param.getOpenId())) {
+//                        return ResponseDto.failure("微信支付openId不能为空!");
+//                    }
+//                }
+//            }
             DragonPayBaseReqDto dragonPayBaseReqDto = DragonPayBaseReqDto.getNew();
             dragonPayBaseReqDto.setPayType(param.getPayType());
             dragonPayBaseReqDto.setDeviceFrom(param.getDeviceFrom());
-            if (param.getDeviceFrom().equals("js") || param.getDeviceFrom().equals("applet")) {
+            if (param.getDeviceFrom().equals("js") || param.getDeviceFrom().equals("applet") || param.getDeviceFrom().equals("appletb")) {
                 dragonPayBaseReqDto.setOpenId(param.getOpenId());
             }
             dragonPayBaseReqDto.setType("PRODUCT");