二手回调bugfix

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

@@ -83,18 +83,6 @@ public class HeliPayUtil {
             pay.setP18_desc(heliDto.getProductId().toString() + "," + BizType.getNumByType(heliDto.getPayType()));
             //收款账号
             pay.setP3_customerNumber(Constant.CUSTOMERNUM);
-            //立即分账，固定金额
-//            pay.setSplitBillType("FIXED_AMOUNT");
-            //分账对象
-//            PaySplitVo paySplitVo = new PaySplitVo();
-            //分账账户邮箱 二手进信息
-            //交易分账规则串必须包含两个参数，分别是分账商户的合法邮箱splitBillMerchantEmail和对应分账合法金额splitBillAmount，
-            //分账金额单位:元,最多保留两位小数，分账规则串中不可以重复出现同一邮箱，分账规则串中不可以传分账发起方自己；
-//            paySplitVo.setSplitBillMerchantEmail(Constant.XX_MAIL);
-            //手续费0.25% 支付金额*(1-0.25%)
-//            paySplitVo.setSplitBillAmount("99.75");
-//            String s = JSON.toJSONString(new ArrayList<PaySplitVo>().add(paySplitVo));
-//            pay.setRuleJson(s);
         } else if ("vip".equals(payFlag)) {
             VipRecordBo record = payOrderMapper.getVipPackageRecord(heliDto.getVipRecordId());
             Double price = payOrderMapper.getVipPackagePriceById(record.getPackageId());

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

@@ -16,7 +16,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -343,15 +342,12 @@ public class OrderCommonService {
             });
             // 拼接运费信息
             shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == 2 ?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee());
-
             shopOrder.setOrderProductList(orderProductList);
             shopOrder.setShopLogo(ImageUtil.getImageUrl("shopLogo", shopOrder.getShopLogo(), domain));
-            //if (0 == order.getOnlinePayFlag()) {
             if (null == shopOrder.getRealPay()) {
                 shopOrder.setRealPay(shopOrder.getNeedPayAmount());
             }
             shopOrder.setObligation(MathUtil.sub(shopOrder.getRealPay(), shopOrder.getReceiptAmount()).doubleValue());
-            //}
         }
 
     }

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

@@ -35,6 +35,9 @@ public class Constant {
      */
     public static final String REQUEST_URL_QUICKPAY = "http://quickpay.trx.helipay.com/trx/quickPayApi/interface.action";
 
+    public static final String REQUEST_URL_BIGPAY = "https://pay.trx.helipay.com/trx/largePaymentApi/interface.action";
+
+
     public static final String DOMAIN_NAME = "http://pay.trx.helipay.com/";
     /**
      * 网银地址http://pay.trx.helipay.com/trx/online/interface.action

src/main/java/com/caimei365/order/model/enums/BizType.java

@@ -8,7 +8,7 @@ public enum BizType {
     // 企业网银  return "12";
     // 个人网银 "17";
 
-    //    YL("YL", "AppPayPublic", "PUBLIC", "17"), //银联
+
     B2B("B2B", "", "", "12"),//企业网银
     B2C("B2C", "", "", "17"),//个人
     XCX("XCX", "AppPayApplet", "APPLET", "15"),//小程序

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

@@ -21,7 +21,6 @@ import com.caimei365.order.model.vo.*;
 import com.caimei365.order.service.HeliPayNonOrderService;
 import com.caimei365.order.service.RemoteCallService;
 import com.caimei365.order.utils.MathUtil;
-import com.caimei365.order.utils.PayUtil;
 import com.caimei365.order.utils.helipay.Disguiser;
 import com.caimei365.order.utils.helipay.HttpClientService;
 import com.caimei365.order.utils.helipay.MessageHandle;
@@ -441,6 +440,7 @@ public class HeliPayNonOrderServiceImpl implements HeliPayNonOrderService {
         payOrderMapper.insertSplitAccount(splitAccount);
     }
 
+
     /**
      * 二手发布支付回调
      */
@@ -482,11 +482,10 @@ public class HeliPayNonOrderServiceImpl implements HeliPayNonOrderService {
         //存收款列表
         Date date = new Date();
         String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-        String payTyp = PayUtil.getPayTypeId(payType, split[2]);
         // 保存收款记录
         DiscernReceiptPo discernReceipt = new DiscernReceiptPo();
         discernReceipt.setPayWay(1);
-        discernReceipt.setPayType(Integer.valueOf(payTyp));
+        discernReceipt.setPayType(Integer.valueOf(payType));
         discernReceipt.setReceiptType(7);
         discernReceipt.setReceiptStatus(3);
         discernReceipt.setReceiptAmount(amount);
@@ -1111,7 +1110,6 @@ public class HeliPayNonOrderServiceImpl implements HeliPayNonOrderService {
         //存收款列表
         Date date = new Date();
         String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-//        String payTyp = PayUtil.getPayTypeId(payType, split[2]);
         // 保存收款记录
         DiscernReceiptPo discernReceipt = new DiscernReceiptPo();
         discernReceipt.setPayWay(1);

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

@@ -9,12 +9,10 @@ import com.caimei365.order.mapper.*;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.VoucherDto;
 import com.caimei365.order.model.dto.VoucherImageDto;
-import com.caimei365.order.model.enums.OrderStatus;
 import com.caimei365.order.model.po.*;
 import com.caimei365.order.model.vo.*;
-import com.caimei365.order.service.RemoteCallService;
 import com.caimei365.order.service.OrderClubService;
-import com.caimei365.order.utils.CodeUtil;
+import com.caimei365.order.service.RemoteCallService;
 import com.caimei365.order.utils.ImageUtil;
 import com.caimei365.order.utils.MathUtil;
 import com.github.pagehelper.PageHelper;
@@ -33,9 +31,7 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Description
@@ -225,7 +221,6 @@ public class OrderClubServiceImpl implements OrderClubService {
      */
     @Override
     public ResponseJson<Map<String, Object>> getOrderDetail(Integer userId, Integer shopOrderId) {
-//        OrderPo orderPo = orderClubMapper.getMainOrderByOrderId(orderId);
         ShopOrderVo shopOrder = orderClubMapper.getShopOrderById(shopOrderId);
         if (null == shopOrder) {
             return ResponseJson.error("该订单不存在！", null);
@@ -233,19 +228,12 @@ public class OrderClubServiceImpl implements OrderClubService {
         if (!userId.equals(shopOrder.getUserId())) {
             return ResponseJson.error("无权限查看此订单！", null);
         }
-//        OrderVo order = new OrderVo();
-        // OrderPo -> OrderVo
-//        BeanUtils.copyProperties(orderPo, order);
-
         shopOrder.setOrderMark("#" + shopOrder.getShopOrderId() + "#");
         // 设置订单状态
         orderCommonService.setShopOrderStatus(shopOrder);
         // 设置子订单信息
         orderCommonService.setShopOrderInfo(shopOrder);
-        // 子订单列表
-//        List<ShopOrderVo> shopOrderList = order.getShopOrderList();
         AtomicDouble expensesOfTaxation = new AtomicDouble(0d);
-//        shopOrderList.forEach(shopOrder -> {
         List<OrderProductVo> orderProductList = shopOrder.getOrderProductList();
         orderProductList.forEach(orderProduct -> {
             // 是否充值商品
@@ -292,7 +280,6 @@ public class OrderClubServiceImpl implements OrderClubService {
             });
         }
         shopOrder.setVoucher(voucher);
-//        });
         shopOrder.setExpensesOfTaxation(expensesOfTaxation.get());
         // 发票信息
         InvoiceVo invoice = null;