参数改造

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

@@ -4,6 +4,7 @@ import com.freemud.sdk.api.assortment.order.config.BaseConfig;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -70,6 +71,12 @@ public class ConfirmOrderRequest extends BaseConfig {
      */
     private String mealCodeRule;
 
+    private String sendPointActivityCode;
+    private Date sendPointEndTime;
+    private Integer sendPointSendPoint;
+    private Integer sendPointMaxNum;
+    private Integer sendPointValidityDateDays;
+
 
     @Data
     public static class OrderSettlement{

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -349,6 +349,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             extInfoDTO.setPayTransId(confirmOrderRequest.getPayTransId());
             extInfoDTO.setPayDate(confirmOrderRequest.getPayDate());
             extInfoDTO.setEndTransId(confirmOrderRequest.getEndTransId());
+
             request.setExtInfo(JSON.toJSONString(extInfoDTO));
         }catch (Exception e){
             ErrorLog.printErrorLog("getMemberExtendInfoError",MEMBER_EXTEND_INFO,confirmOrderRequest,e);

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

@@ -288,7 +288,7 @@ public class OrderAdapter {
         }
         createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
 
-        createOrderDto.setOtherInfo(getOrderOtherInfo(shoppingCartGoodsDto));
+        // createOrderDto.setOtherInfo(getOrderOtherInfo(shoppingCartGoodsDto));
         return createOrderDto;
     }
 
@@ -3346,6 +3346,9 @@ public class OrderAdapter {
         }
     }
 
+
+
+
     public DeleteOrderDto convent2DeleteOrderDto(String oId) {
         DeleteOrderDto deleteOrderDto = new DeleteOrderDto();
         deleteOrderDto.setOrderId(oId);

order-application-service/src/main/java/cn/freemud/constant/RedisKeyConstant.java

@@ -61,4 +61,10 @@ public class RedisKeyConstant {
      * 商户订单支付超时时间设置key
      */
     public final static String PARTNER_PAY_OVERTIME = "partner_pay_overtime";
+
+    /**
+     * 积点前缀
+     */
+    public final static String KGD_SENDPOINT_ORDERID = "kgd:sendpoint:orderid:";
+
 }

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

@@ -328,6 +328,11 @@ public class OrderServiceImpl implements Orderservice {
             return createOrderOperateDtoResponse;
         }
         CreateOrderOperateDto createOrderOperateDto = (CreateOrderOperateDto)createOrderOperateDtoResponse.getResult();
+        // 设置集点值
+        ShoppingCartGoodsDto.SendPoint sendPoint = shoppingCartGoodsDto.getSendPoint();
+        if (sendPoint != null){
+            redisCache.save(RedisKeyConstant.KGD_SENDPOINT_ORDERID + createOrderOperateDto.getFatherOrderBean().getOid(), sendPoint, 1L, TimeUnit.DAYS);
+        }
         //创建支付
         CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(userLoginInfoDto, createOrderVo, createOrderOperateDto, extInfo);
         return this.createPrepayOrder(createPrepayRequestDto);
@@ -433,6 +438,14 @@ public class OrderServiceImpl implements Orderservice {
         if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
             var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         }
+        ShoppingCartGoodsDto.SendPoint value = (ShoppingCartGoodsDto.SendPoint)redisCache.getValue(RedisKeyConstant.KGD_SENDPOINT_ORDERID + var1.getOrderId());
+        if (value != null){
+            var1.setSendPointActivityCode(value.getActivityCode());
+            var1.setSendPointEndTime(value.getEndTime());
+            var1.setSendPointMaxNum(value.getMaxNum());
+            var1.setSendPointSendPoint(value.getSendPoint());
+            var1.setSendPointValidityDateDays(value.getValidityDateDays());
+        }
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
         String string2 = JSONObject.toJSONString(payAccessRes);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -14,6 +14,8 @@ package com.freemud.application.sdk.api.ordercenter.request;
 
 import lombok.Data;
 
+import java.util.Date;
+
 
 @Data
 public class OrderExtInfoDto {
@@ -173,4 +175,12 @@ public class OrderExtInfoDto {
      * 麦咖啡会员号
      */
     private String thirdPartyMemberId;
+
+    private String sendPointActivityCode;
+    private Date sendPointEndTime;
+    private Integer sendPointSendPoint;
+    private Integer sendPointMaxNum;
+    private Integer sendPointValidityDateDays;
+
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -866,10 +866,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             sendPointNew.setMaxNum(sendPointVo.getMaxNum());
             sendPointNew.setSendPoint(sendPointVo.getSendPoint());
             sendPointNew.setValidityDateDays(sendPointVo.getValidityDateDays());
+            sendPointNew.setActivityCode(discountDTO.getActivityCode());
+            sendPointNew.setEndTime(discountDTO.getEndTime());
+            result.setSendPointVo(sendPointNew);
         }
-        sendPointNew.setActivityCode(discountDTO.getActivityCode());
-        sendPointNew.setEndTime(discountDTO.getEndTime());
-        result.setSendPointVo(sendPointNew);
+
     }
 
     /**