混合支付Beta

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

@@ -3349,6 +3349,14 @@ public class OrderAdapter {
                 , createOrderVo.getUnionPayCard()
                 );
     }
+
+    /**
+     *  混合支付
+     * @param userLoginInfoDto
+     * @param createOrderOperateDto
+     * @param createOrderVo
+     * @return
+     */
     public CreatePrepayRequestDto convertToCreatePrepayRequestDto(AssortmentCustomerInfoVo userLoginInfoDto
             ,CreateOrderOperateDto createOrderOperateDto
             ,CreateOrderVo createOrderVo) {
@@ -3362,6 +3370,7 @@ public class OrderAdapter {
         requestDto.setTotalAmount(createOrderOperateDto.getTotalAmount());
         requestDto.setTransId(createOrderOperateDto.getFatherOrderBean().getOid());
         requestDto.setFatherOrderBean(createOrderOperateDto.getFatherOrderBean());
+        requestDto.setProductOrderBean(createOrderOperateDto.getProductOrderBean());
         requestDto.setOrderPayItemCreateReqList(createOrderVo.getOrderPayItemCreateReqList());
         requestDto.setStoreId(createOrderVo.getShopId());
         return requestDto;
@@ -3561,7 +3570,7 @@ public class OrderAdapter {
         payBean.setAppid(payPlatform.getAppId());
         payBean.setNonceStr(payPlatform.getNonceStr());
         payBean.setPackageX(payPlatform.get_package());
-        payBean.setSign(payPlatform.getSign());
+        payBean.setSign(payPlatform.getPaySign());
         payBean.setSignType(payPlatform.getPaySignType());
         payBean.setTimestamp(payPlatform.getTimestamp());
         //payBean.setAliPayOrder(payOrderBean.getAliPayOrder());