蜜雪中台

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

@@ -14,4 +14,6 @@ public class PaymentRequest extends BaseConfig {
 
     private String reverseNotifyiDcUrl;
 
+    private String payCode;
+
 }

order-application-service/pom.xml

@@ -315,7 +315,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.4.1-SNAPSHOT</version>
+            <version>2.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

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

@@ -794,6 +794,8 @@ public class OrderAdapter {
             queryOrdersDto.setSource(new String[]{"meals"});
         } else if(OrderChannelType.SAASMALL.getCode().equals(channelType)) {
             queryOrdersDto.setSource(new String[]{"saasmall"});
+        } else if(OrderChannelType.APP.getCode().equals(channelType)){
+            queryOrdersDto.setSource(new String[]{"app"});
         } else {
             queryOrdersDto.setSource(new String[]{"saas"});
         }
@@ -2243,6 +2245,7 @@ public class OrderAdapter {
             });
         }
         orderPayDto.setProducts(productBeans);
+        orderPayDto.setPayCode(paymentRequest.getPayCode());
         return orderPayDto;
     }
 
@@ -2740,7 +2743,7 @@ public class OrderAdapter {
 
 
     public CreatePrepayRequestDto convertToCreatePrepayRequestDto(String partnerId, String wxAppId, String openId,
-             String faceCode, String cardCode, QueryOrdersResponse.DataBean.OrderBean fatherOrderBean,
+             String faceCode, String cardCode, String payCode, QueryOrdersResponse.DataBean.OrderBean fatherOrderBean,
              QueryOrdersResponse.DataBean.OrderBean productOrderBean, long totalAmount, int cardAmount, OrderExtInfoDTO orderExtInfoDTO){
         CreatePrepayRequestDto requestDto = new CreatePrepayRequestDto();
         requestDto.setPartnerId(partnerId);
@@ -2748,6 +2751,7 @@ public class OrderAdapter {
         requestDto.setOpenId(openId);
         requestDto.setFaceCode(faceCode);
         requestDto.setCardCode(cardCode);
+        requestDto.setPayCode(payCode);
         requestDto.setFatherOrderBean(fatherOrderBean);
         requestDto.setProductOrderBean(productOrderBean);
         requestDto.setTotalAmount(totalAmount);
@@ -2759,7 +2763,8 @@ public class OrderAdapter {
     public CreatePrepayRequestDto convertToCreatePrepayRequestDto(AssortmentCustomerInfoVo userLoginInfoDto,CreateOrderVo createOrderVo,
                                                                   CreateOrderOperateDto createOrderOperateDto, OrderExtInfoDTO orderExtInfoDTO){
         return this.convertToCreatePrepayRequestDto(createOrderVo.getPartnerId(), userLoginInfoDto.getWxAppId(), userLoginInfoDto.getOpenId(),
-                createOrderVo.getFaceCode(), createOrderVo.getCardCode(), createOrderOperateDto.getFatherOrderBean(), createOrderOperateDto.getProductOrderBean(),
+                createOrderVo.getFaceCode(), createOrderVo.getCardCode(), null,
+                createOrderOperateDto.getFatherOrderBean(), createOrderOperateDto.getProductOrderBean(),
                 createOrderOperateDto.getTotalAmount() == null ? 0 : createOrderOperateDto.getTotalAmount(),
                 createOrderOperateDto.getCardAmount() == null ? 0 : createOrderOperateDto.getCardAmount(), orderExtInfoDTO);
     }

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

@@ -11,6 +11,7 @@ public class CreatePrepayRequestDto {
     private String openId;
     private String faceCode;
     private String cardCode;
+    private String payCode;
     private QueryOrdersResponse.DataBean.OrderBean fatherOrderBean;
     private QueryOrdersResponse.DataBean.OrderBean productOrderBean;
     private long totalAmount;

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

@@ -39,4 +39,7 @@ public class CreatePrepayVo {
 
     @ApiModelProperty(value = "微信openId")
     private String openId;
+
+    @ApiModelProperty(value = "支付渠道编号(参考支付组payment_platform)")
+    private String payCode;
 }

order-application-service/src/main/java/cn/freemud/enums/OrderChannelType.java

@@ -20,7 +20,9 @@ public enum OrderChannelType {
 
     IWC("iwc","i围餐"),
 
-    SAASMALL("saasmall", "微商城");
+    SAASMALL("saasmall", "微商城"),
+
+    APP("app", "APP");
 
     private String code;
 

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

@@ -95,7 +95,7 @@ public class AppOrderServiceImpl implements AppOrderService {
         String faceCode = "";
         String cardCode = "";
         CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(createPrepayVo.getPartnerId(), createPrepayVo.getPayAppId(), createPrepayVo.getOpenId(), faceCode,
-                cardCode, createOrderOperateDto.getFatherOrderBean(), createOrderOperateDto.getProductOrderBean(), createOrderOperateDto.getTotalAmount(),
+                cardCode, createPrepayVo.getPayCode(), createOrderOperateDto.getFatherOrderBean(), createOrderOperateDto.getProductOrderBean(), createOrderOperateDto.getTotalAmount(),
                 createOrderOperateDto.getCardAmount(), extInfo);
         return orderservice.createPrepayOrder(createPrepayRequestDto);
     }

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

@@ -1780,7 +1780,7 @@ public class OrderServiceImpl implements Orderservice {
 
         CreateOrderResponseVo createOrderResponse;
         OrderPayResponse orderPayResponse = null;
-        PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(), createPrepayRequestDto.getWxAppId());
+        PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(), createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPayCode());
         long totalAmount = createPrepayRequestDto.getTotalAmount();
         String cardCode = createPrepayRequestDto.getCardCode();
         if (totalAmount < 0) {
@@ -1948,7 +1948,7 @@ public class OrderServiceImpl implements Orderservice {
         return orderPayResponse;
     }
 
-    private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId,String appId) {
+    private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId,String appId, String payCode) {
 //        String wxAppId = userLoginInfoDto.getWxAppId();
         //设置支付信息
         PaymentRequest paymentRequest = new PaymentRequest();
@@ -1961,6 +1961,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         paymentRequest.setPrincipalName(principalName);
         paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl);
+        paymentRequest.setPayCode(payCode);
         return paymentRequest;
     }
 
@@ -2331,7 +2332,7 @@ public class OrderServiceImpl implements Orderservice {
         //<!---创建订单公共方法执行逻辑--->
         OrderPayResponse orderPayResponse = null;
         String appId = userLoginInfoDto.getWxAppId();
-        PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(userLoginInfoDto.getOpenId(), createOrderVo.getPartnerId(),appId);
+        PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(userLoginInfoDto.getOpenId(), createOrderVo.getPartnerId(),appId, null);
         //支付金额异常
         if (totalAmount < 0) {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
@@ -2415,6 +2416,8 @@ public class OrderServiceImpl implements Orderservice {
             channelType = OrderChannelType.IWC.getCode();
         } else if(OrderChannelType.SAASMALL.getCode().equals(queryOrderVo.getChannelType())) {
             channelType = OrderChannelType.SAASMALL.getCode();
+        } else if(UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())) {
+            channelType = OrderChannelType.APP.getCode();
         }
         return channelType;
     }