调整混合支付流程

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -262,7 +262,6 @@ public class OrderSdkAdapter {
         //订单重量
         Double orderWeight = sumOrderWeight(requestVO.getProducts());
         request.setWeight(orderWeight);
-        request.setOrderPayItemCreateReqList(requestVO.getOrderPayItemCreateReqList());
         return request;
     }
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -166,7 +166,6 @@ public class BaseCreateOrderRequest extends BaseConfig {
      * 收货地址Id
      */
     private String receiveId;
-    private List<OrderPayItemCreateReq> orderPayItemCreateReqList;
     @Data
     public static class DeliveryTypeInfo {
         /**

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -303,8 +303,6 @@ public class OrderAdapter {
             createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest);
         }
         createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
-        createOrderDto.setOrderPayItemCreateReqList(createOrderVo.getOrderPayItemCreateReqList());
-        // createOrderDto.setOtherInfo(getOrderOtherInfo(shoppingCartGoodsDto));
         return createOrderDto;
     }
 
@@ -3361,9 +3359,8 @@ public class OrderAdapter {
                 , null
                 , createOrderVo.getUnionPayCard()
                 , createOrderVo.getShopId()
-                , createOrderVo.getOrderPayItemCreateReqList()
-                , createOrderVo.getCashAmount()
-                , createOrderVo.getSvcAmount());
+                , createOrderVo.getChannel()
+               );
     }
     public CreatePrepayRequestDto convertToCreatePrepayRequestDto(String partnerId
             , String wxAppId, String openId
@@ -3375,13 +3372,11 @@ public class OrderAdapter {
             , long totalAmount
             , int cardAmount
             , OrderExtInfoDto orderExtInfoDTO
-            ,String transId
+            , String transId
             , OrderClientType orderClient
             , CreateOrderVo.UnionPayCard unionPayCard
             , String storeId
-            , List<OrderPayItemCreateReq> payItem
-            , BigDecimal cashAmount
-            , BigDecimal svcAmount){
+            , String channel){
         CreatePrepayRequestDto requestDto = new CreatePrepayRequestDto();
         requestDto.setPartnerId(partnerId);
         requestDto.setWxAppId(wxAppId);
@@ -3398,9 +3393,7 @@ public class OrderAdapter {
         requestDto.setOrderClient(orderClient);
         requestDto.setUnionPayCard(unionPayCard);
         requestDto.setStoreId(storeId);
-        requestDto.setOrderPayItemCreateReqList(payItem);
-        requestDto.setCashAmount(cashAmount);
-        requestDto.setSvcAmount(svcAmount);
+        requestDto.setChannel(channel);
         return requestDto;
     }
 
@@ -3505,62 +3498,33 @@ public class OrderAdapter {
         return deleteOrderDto;
     }
 
-    /**
-     * svc卡支付+现金支付
-     * @param cashAmount
-     * @param svcAmount
-     * @param payChannelType
-     * @return
-     */
-    public List<OrderPayItemCreateReq> setOrderPayItem(BigDecimal cashAmount,BigDecimal svcAmount, Byte payChannelType){
-        List<OrderPayItemCreateReq> orderPayItemCreateReqs = new ArrayList<>(0);
-        OrderPayItemCreateReq orderPayItemCreateReqSvc = new OrderPayItemCreateReq();
-
-        //svc卡
-        orderPayItemCreateReqSvc.setPayAmount(svcAmount);
-        orderPayItemCreateReqSvc.setPayChannelType(PayChannelType.SVC.getIndex().intValue());
-        orderPayItemCreateReqSvc.setPayChannelName(PayChannelType.SVC.getName());
-        orderPayItemCreateReqSvc.setPayEbCode(PayChannelType.SVC.getEbcode());
-        orderPayItemCreateReqs.add(orderPayItemCreateReqSvc);
-        //现金支付
-        OrderPayItemCreateReq orderPayItemCreateReqOther = new OrderPayItemCreateReq();
-        orderPayItemCreateReqOther.setPayAmount(cashAmount);
-        orderPayItemCreateReqOther.setPayChannelType(PayChannelType.getByIndex(payChannelType).getIndex().intValue());
-        orderPayItemCreateReqOther.setPayChannelName(PayChannelType.getByIndex(payChannelType).getName());
-        orderPayItemCreateReqOther.setPayEbCode(PayChannelType.getByIndex(payChannelType).getEbcode());
-        orderPayItemCreateReqs.add(orderPayItemCreateReqOther);
-        return orderPayItemCreateReqs;
-    }
-
-    /**
-     * 混合支付预支付信息转换
-     * @param paymentRequest
-     * @param createPrepayRequestDto
-     * @param partnerPayOvertime
-     * @return
-     */
-    public CombPayRequest convent2CombPayOrderRequest(PaymentRequest paymentRequest
-            , CreatePrepayRequestDto createPrepayRequestDto
-            , String partnerPayOvertime,String orderClient) {
-
+    public CombPayRequest convent2CombPayOrderRequest(String cardNo
+            , QueryOrdersResponse.DataBean.OrderBean orderBean
+            , PaymentRequest paymentRequest
+            , String partnerPayOvertime
+            , String orderClient
+            , String channel
+            , Integer totalAmount
+            , Integer svcAmount
+            , Integer svcVAmount) {
         CombPayRequest orderPayDto = new CombPayRequest();
         orderPayDto.setEbCode(paymentRequest.getPayCode());
-        orderPayDto.setPartner_id(createPrepayRequestDto.getPartnerId());
+        orderPayDto.setPartner_id(orderBean.getCompanyId());
         orderPayDto.setBody(paymentRequest.getPrincipalName());
         orderPayDto.setNotify_url(paymentRequest.getReverseNotifyiDcUrl());
-        orderPayDto.setStore_id(createPrepayRequestDto.getStoreId());
+        orderPayDto.setStore_id(orderBean.getShopId());
         orderPayDto.setOpen_id(paymentRequest.getOpenId());
         String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
         orderPayDto.setBusiness_date(businessDate);
-        orderPayDto.setAmount(createPrepayRequestDto.getTotalAmount());
+        orderPayDto.setAmount(totalAmount.longValue());
         orderPayDto.setVip_amount(0L);
         orderPayDto.setAppId(paymentRequest.getWxAppId());
         orderPayDto.setPayCode(paymentRequest.getPayCode());
         orderPayDto.setVer("V1");
         orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
         List<ProductVO> productVOS = new ArrayList<ProductVO>();
-        if (CollectionUtils.isNotEmpty(createPrepayRequestDto.getFatherOrderBean().getProductList())) {
-            for (QueryOrdersResponse.DataBean.OrderBean.ProductBean product : createPrepayRequestDto.getFatherOrderBean().getProductList()) {
+        if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
+            for (QueryOrdersResponse.DataBean.OrderBean.ProductBean product : orderBean.getProductList()) {
                 ProductVO productBean = new ProductVO();
                 productBean.setId(product.getProductId());
                 productBean.setQuantity(product.getNumber());
@@ -3573,29 +3537,26 @@ public class OrderAdapter {
         }
         orderPayDto.setProducts(productVOS);
         List<PayPlatformVO> platforms = new ArrayList<>();
-        if(null != createPrepayRequestDto.getOrderPayItemCreateReqList() && createPrepayRequestDto.getOrderPayItemCreateReqList().size()>0){
-            for (OrderPayItemCreateReq orderPayItemCreateReq : createPrepayRequestDto.getOrderPayItemCreateReqList()) {
+        Long svc = svcAmount.longValue()+svcVAmount.longValue();
         PayPlatformVO payPlatformVO = new PayPlatformVO();
-                payPlatformVO.setAmount(orderPayItemCreateReq.getPayAmount().longValue());
-                payPlatformVO.setEbcode(orderPayItemCreateReq.getPayEbCode());
-                if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.SVC.getEbcode())) {
-                    payPlatformVO.setClientCode(orderPayItemCreateReq.getPayEbCode());
-                }
-                else if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.WECHAT.getEbcode())) {
-                    payPlatformVO.setClientCode(orderClient);
-                }
-                else if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.ALIPAY.getEbcode())) {
+        payPlatformVO.setClientCode(PayChannelType.SVC.getEbcode());
+        payPlatformVO.setEbcode(PayChannelType.SVC.getEbcode());
+        payPlatformVO.setAmount(svc);
+        platforms.add(payPlatformVO);
+
+        String ebcode = PayChannelType.getByIndex(Byte.parseByte(channel)).getEbcode();
+        payPlatformVO = new PayPlatformVO();
+        payPlatformVO.setAmount(totalAmount.longValue() - svc);
         payPlatformVO.setClientCode(orderClient);
-                }
+        payPlatformVO.setEbcode(ebcode);
         platforms.add(payPlatformVO);
-            }
-        }
+
         orderPayDto.setPlatforms(platforms);
-        orderPayDto.setOut_order_no(createPrepayRequestDto.getFatherOrderBean().getOid());
-        orderPayDto.setCardCode(createPrepayRequestDto.getCardCode());
+        orderPayDto.setOut_order_no(orderBean.getOid());
+        orderPayDto.setCardCode(cardNo);
         return orderPayDto;
-    }
 
+    }
     /**
      * 混合支付返回的支付参数
      * @param payPlatforms
@@ -3630,6 +3591,7 @@ public class OrderAdapter {
             PayItem payItem = new PayItem();
             payItem.setFmTradeNo(pt.getFmTradeNo());
             payItem.setPayChannelType(PayChannelType.getByEbcode(pt.getEbCode()).getIndex().intValue());
+            //payItem.setPayChannelName(PayChannelType.getByEbcode(pt.getEbCode()).getName());
             payItem.setTransId(pt.getTransId());
             payItem.setPartnerId(partnerId);
             responseDto.getPayItem().add(payItem);

order-application-service/src/main/java/cn/freemud/entities/dto/order/CreatePrepayRequestDto.java

@@ -71,15 +71,6 @@ public class CreatePrepayRequestDto {
      * 使用电子风味卡
      */
     private CreateOrderVo.UnionPayCard unionPayCard;
-
-    private List<OrderPayItemCreateReq> orderPayItemCreateReqList;
-    /**
-     * svc支付金额
-     */
-    private BigDecimal svcAmount;
-    /**
-     * 现金支付金额
-     */
-    private BigDecimal cashAmount;
     private String storeId;
+    private String channel;
 }

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -249,19 +249,6 @@ public class CreateOrderVo {
     @Valid
     @ApiModelProperty(value = "电子风味卡")
     private UnionPayCard unionPayCard;
-
-    /**
-     * 混合支付
-     */
-    private List<OrderPayItemCreateReq> orderPayItemCreateReqList = new ArrayList<>();
-    /**
-     * svc支付金额
-     */
-    private BigDecimal svcAmount;
-    /**
-     * 现金支付金额
-     */
-    private BigDecimal cashAmount;
     /**
      * 电子风味卡
      */

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

@@ -750,47 +750,4 @@ public class CheckOrder {
 //            throw new ServiceException(ResponseResult.STORE_ITEM_STOP_BUSINESS);
 //        }
     }
-
-    /**
-     * 混合支付
-     * @param createOrderVo
-     * @param shoppingCartGoodsDto
-     * @param trackingNo
-     * @return
-     */
-    public boolean checkSvcPay(CreateOrderVo createOrderVo,ShoppingCartGoodsDto shoppingCartGoodsDto,String trackingNo) {
-        if (StringUtils.isBlank(createOrderVo.getCardCode())) {
-            return false;
-        }
-        //这么不合规的粗暴搞法 设置支付方式
-        PayChannelType payType = PayChannelType.getByIndex(Byte.parseByte(createOrderVo.getChannel()));
-        createOrderVo.setPayChannelType(payType.getIndex());
-
-        SVCCardAmountRequest request = new SVCCardAmountRequest();
-        request.setPartnerId(createOrderVo.getPartnerId());
-        request.setCardCodes(Arrays.asList(createOrderVo.getCardCode()));
-        BaseResponse<SVCCardAmountResponse> svcCardAmount = paymentNewService.querySVCCardAmount(request, trackingNo);
-        if (svcCardAmount==null || svcCardAmount.getData()==null ||!ResponseResult.SUCCESS.getCode().equals(svcCardAmount.getCode())) {
-            throw new ServiceException(ResponseResult.USER_SVC_CARD_ERROR);
-        }
-        Integer svcAmount = 0 ;
-        Integer svcVAmount = 0 ;
-        Long totalVAmount = shoppingCartGoodsDto.getTotalAmount() +shoppingCartGoodsDto.getPackageAmount();
-        if (svcCardAmount.getData().getData().getCardSimpleInfos().size()>0) {
-            svcAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getAmount();
-            svcVAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getVamount();
-            //todo : svc卡的金额小于订单金额
-            if(svcAmount + svcVAmount >0 && totalVAmount> svcAmount + svcVAmount){
-                BigDecimal total = new BigDecimal(totalVAmount);
-                BigDecimal svcAmounts =  new BigDecimal(svcAmount + svcVAmount);
-                BigDecimal cashAmout = total.subtract(svcAmounts);
-                createOrderVo.setOrderPayItemCreateReqList(orderAdapter.setOrderPayItem(cashAmout,svcAmounts,Byte.parseByte(createOrderVo.getChannel())));
-                createOrderVo.setPayChannelType(PayChannelType.COMB.getIndex());
-                createOrderVo.setCashAmount(cashAmout);
-                createOrderVo.setSvcAmount(svcAmounts);
-                return true;
-            }
-        }
-        return false;
-    }
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/PayItem.java

@@ -20,5 +20,10 @@ public  class PayItem {
     private String partnerId;
     private String fmTradeNo;
     private Integer payChannelType;
+    private Integer payChannelName;
     private String transId;
+    private String orderPayItemCode;
+    private String outOrderNo;
+    private String platformTradeNo;
+    private String endTransTradeNo;
 }