OrderPayItem对象合并

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

@@ -1366,9 +1366,9 @@ public class OrderSdkAdapter {
      *
      * @param OrderPayItemReqs
      */
-    private List<OrderPayItemResp> getOrderItemPayList(List<OrderPayItemReqs> OrderPayItemReqs) {
+    private List<OrderPayItemResp> getOrderItemPayList(List<OrderPayItemResp> OrderPayItemReqs) {
         List<OrderPayItemResp> OrderPayItemList = new ArrayList<>(2);
-        for (OrderPayItemReqs orderPayItemReq : OrderPayItemReqs) {
+        for (OrderPayItemResp orderPayItemReq : OrderPayItemReqs) {
             OrderPayItemResp orderPayItem = new OrderPayItemResp();
             orderPayItem.setOrderCode(orderPayItemReq.getOrderCode());
             orderPayItem.setOrderPayItemCode(orderPayItemReq.getOrderPayItemCode());

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -31,9 +31,9 @@ import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
+import com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
 import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
@@ -220,7 +220,7 @@ public class OrderCallBackMQService {
         // 混合支付
         Integer userAmount = 0;
         if (orderInfoReqs.getOrderPayItemCreateReqList()!=null && orderInfoReqs.getOrderPayItemCreateReqList().size()>0) {
-            OrderPayItemReqs orderPayItemReqs = orderInfoReqs.getOrderPayItemCreateReqList()
+            OrderPayItemResp orderPayItemReqs = orderInfoReqs.getOrderPayItemCreateReqList()
                     .stream()
                     .filter(s -> s.getPayChannelType().equals(PayChannelType.WECHAT.getIndex().intValue()) || s.getPayChannelType().equals(PayChannelType.ALIPAY.getIndex().intValue()))
                     .findFirst().orElse(null);

order-application-service/src/main/java/cn/freemud/service/PointsMallOrderService.java

@@ -4,7 +4,9 @@ import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.CreateOrderVo;
 import cn.freemud.entities.vo.PaysuccessNoticeMessage;
 import cn.freemud.entities.vo.QueryOrderVo;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
+
+import java.util.Map;
 
 public interface PointsMallOrderService {
 
@@ -16,7 +18,7 @@ public interface PointsMallOrderService {
     /**
      * 支付回调
      */
-    String paySuccessCallback(PaysuccessNoticeMessage message, OrderInfoReqs orderInfo);
+    String paySuccessCallback(PaysuccessNoticeMessage message, Map<String, OrderBeanV1> orderBeans);
 
     BaseResponse scoreRecords(QueryOrderVo queryOrderVo);
 

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

@@ -332,12 +332,9 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             if (OrderSourceType.SAASMALL.getCode().equals(orderBean.getSource())) {
                 return mallOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
             }
-            /**
-             * 积分商城处理
-             */
+            //积分商城处理
             if (OrderSourceType.I_MEMBER.getCode().equals(orderBean.getSource()) && orderBean.getBizType() == 4) {
-                OrderInfoReqs orderInfo = new OrderInfoReqs();
-                return pointsMallOrderService.paySuccessCallback(message,orderInfo);
+                return pointsMallOrderService.paySuccessCallback(message,orderBeans);
             }
             /**
              * app订单处理

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

@@ -21,14 +21,15 @@ import cn.freemud.entities.dto.user.StatislScoreResponse;
 import cn.freemud.entities.dto.user.StatisticalScoreRequestVo;
 import cn.freemud.entities.dto.user.UseScoreRequest;
 import cn.freemud.entities.vo.*;
+import cn.freemud.enums.OrderBeanType;
 import cn.freemud.enums.ResponseResult;
-import cn.freemud.enums.integralproduct.IntegralProductStatusEnum;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.PointsMallOrderService;
 import cn.freemud.service.thirdparty.CustomerPropertyClient;
 import cn.freemud.service.thirdparty.PaymentNewClient;
 import cn.freemud.service.thirdparty.PointMallProductClient;
 import cn.freemud.utils.AppLogUtil;
+import cn.freemud.utils.BeanUtil;
 import cn.freemud.utils.ResponseUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappStore;
@@ -38,6 +39,8 @@ import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIapp
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
@@ -259,7 +262,22 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
     }
 
     @Override
-    public String paySuccessCallback(PaysuccessNoticeMessage message,OrderInfoReqs orderInfo) {
+    public String paySuccessCallback(PaysuccessNoticeMessage message,Map<String, OrderBeanV1> orderBeans) {
+        OrderBeanV1 orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
+        OrderInfoReqs orderInfo = new OrderInfoReqs();
+        orderInfo.setUserName(orderBean.getUserName());
+        orderInfo.setOrderCode(orderBean.getOid());
+        orderInfo.setPartnerId(orderBean.getCompanyId());
+        orderInfo.setUserId(orderBean.getUserId());
+        orderInfo.setOrderPayItemCreateReqList(orderBean.getOrderPayItem());
+        orderInfo.setAppId(orderBean.getAppId());
+        List<OrderItemResp> orderItemList = new ArrayList<>();
+        for (ProductBeanV1 productBean : orderBean.getProductList()){
+            OrderItemResp orderItemResp = new OrderItemResp();
+            BeanUtil.convertBean(productBean,orderItemResp);
+            orderItemList.add(orderItemResp);
+        }
+        orderInfo.setOrderItemList(orderItemList);
         BaseResponse baseResponse = orderPaySuccess(orderInfo);
         if(!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, baseResponse.getCode())){
             return refundFaileMessage(baseResponse.getMessage());
@@ -701,6 +719,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
     }
 
 
+    //共用支付成功方法
     private BaseResponse orderPaySuccess(OrderInfoReqs orderInfo){
         String nickName= orderInfo.getUserName();
         String orderCode = orderInfo.getOrderCode();

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java

@@ -567,9 +567,9 @@ public class OrderCenterSdkAdapter {
      *
      * @param OrderPayItemReqs
      */
-    private List<OrderPayItemResp> getOrderItemPayList(List<OrderPayItemReqs> OrderPayItemReqs) {
+    private List<OrderPayItemResp> getOrderItemPayList(List<OrderPayItemResp> OrderPayItemReqs) {
         List<OrderPayItemResp> OrderPayItemList = new ArrayList<>(2);
-        for (OrderPayItemReqs orderPayItemReq : OrderPayItemReqs) {
+        for (OrderPayItemResp orderPayItemReq : OrderPayItemReqs) {
             OrderPayItemResp orderPayItem = new OrderPayItemResp();
             orderPayItem.setOrderCode(orderPayItemReq.getOrderCode());
             orderPayItem.setOrderPayItemCode(orderPayItemReq.getOrderPayItemCode());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

@@ -430,7 +430,7 @@ public class OrderInfoReqs {
     /**
      * 支付信息
      */
-    private List<OrderPayItemReqs> orderPayItemCreateReqList;
+    private List<OrderPayItemResp> orderPayItemCreateReqList;
 
     private String appId;