bugfix

src/main/java/com/caimei365/order/components/HeliPayUtil.java

@@ -6,11 +6,9 @@ import com.caimei365.order.mapper.OrderCommonMapper;
 import com.caimei365.order.mapper.PayOrderMapper;
 import com.caimei365.order.model.bo.VipRecordBo;
 import com.caimei365.order.model.dto.HeliDto;
-import com.caimei365.order.model.dto.PaySecondDto;
 import com.caimei365.order.model.enums.BizType;
 import com.caimei365.order.model.vo.*;
 import com.caimei365.order.utils.MathUtil;
-import com.caimei365.order.utils.PayUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;

src/main/java/com/caimei365/order/constant/Constant.java

@@ -8,7 +8,7 @@ package com.caimei365.order.constant;
 public class Constant {
 
 
-    //todo 子商户E商编
+
     //专票 信息 测试佣金暂入信息  308785626@qq.com vip/二手暂入信息
     public static final String CUSTOMERNUM = "E1807059160";
     //信息的邮箱

src/main/java/com/caimei365/order/service/impl/HeliPayServiceImpl.java

@@ -104,7 +104,10 @@ public class HeliPayServiceImpl implements HeliPayService {
         log.info("--------进入支付二维码创建接口----------");
         try {
             AppCreateOrderVo pay = new AppCreateOrderVo();
-            String splitCode=payOrderMapper.findShopOrderSplitCode(heliDto.getShopOrderId());
+            String splitCode = payOrderMapper.findShopOrderSplitCode(heliDto.getShopOrderId());
+            if (StringUtils.isBlank(splitCode)) {
+                return ResponseJson.error("子订单无商户号！", null);
+            }
             pay.setP3_customerNumber(splitCode);
             //合利宝主扫接口参数赋值
             heliPayUtil.setValue(pay, heliDto, "order", headers);
@@ -153,7 +156,10 @@ public class HeliPayServiceImpl implements HeliPayService {
         log.info("--------进入公众号/小程序预创建订单接口----------");
         try {
             AppPayPublicCreateOrderVo pay = new AppPayPublicCreateOrderVo();
-            String splitCode=payOrderMapper.findShopOrderSplitCode(heliDto.getShopOrderId());
+            String splitCode = payOrderMapper.findShopOrderSplitCode(heliDto.getShopOrderId());
+            if (StringUtils.isBlank(splitCode)) {
+                return ResponseJson.error("子订单无商户号！", null);
+            }
             pay.setP3_customerNumber(splitCode);
             //合利宝主扫接口参数赋值
             heliPayUtil.setOnlineValue(pay, heliDto, "order", headers);
@@ -239,11 +245,11 @@ public class HeliPayServiceImpl implements HeliPayService {
         Integer shopOrderId = Integer.valueOf(split[2]);
         // 订单信息
         OrderVo order = orderCommonMapper.getOrderByOrderId(orderId);
-        ShopOrderVo shopOrder=orderCommonMapper.getShopOrderByOrderId(shopOrderId);
+        ShopOrderVo shopOrder = orderCommonMapper.getShopOrderByOrderId(shopOrderId);
         if (null == order) {
             return "订单不存在";
         }
-        if(null == shopOrder){
+        if (null == shopOrder) {
             return "子订单不存在";
         }
         // 支付记录
@@ -304,11 +310,11 @@ public class HeliPayServiceImpl implements HeliPayService {
                 shopOrderReceiptAmount = MathUtil.add(shopOrderReceiptAmount, discernReceipt.getAssociateAmount()).doubleValue();
             }
         }
-        shopOrder.setReceiptAmount(MathUtil.add(shopOrderReceiptAmount,amount).doubleValue());
+        shopOrder.setReceiptAmount(MathUtil.add(shopOrderReceiptAmount, amount).doubleValue());
         //均摊后needpay:已支付
         if (MathUtil.compare(shopOrder.getRealPay(), shopOrder.getReceiptAmount()) == 0) {
             shopOrder.setReceiptStatus(3);
-        }else{
+        } else {
             shopOrder.setReceiptStatus(2);
         }
 
@@ -511,7 +517,10 @@ public class HeliPayServiceImpl implements HeliPayService {
         }
         try {
             HeliOnlineVo heliOnlineVo = new HeliOnlineVo();
-            String splitCode=payOrderMapper.findShopOrderSplitCode(heliDto.getShopOrderId());
+            String splitCode = payOrderMapper.findShopOrderSplitCode(heliDto.getShopOrderId());
+            if (StringUtils.isBlank(splitCode)) {
+                return ResponseJson.error("子订单无商户号！", null);
+            }
             heliPayUtil.setLinkValue(heliOnlineVo, heliDto, "order", headers);
             Map<String, String> map = MyBeanUtils.convertBean(heliOnlineVo, new LinkedHashMap());
             String oriMessage = MyBeanUtils.getSignedByPresetParameter(map, HeliOnlineVo.NEED_SIGN_PARAMS);