Merge branch 'feature/2.0.4-集点改造' into qa

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

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

@@ -1007,16 +1007,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     }
 
     private void convert2SendPoint(ActivityCalculationDiscountResponseDto.CalculationDiscountResult result, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discountDTO) {
-        SendPoint sendPoint = result.getSendPointVo();
-        if (sendPoint != null) {
-            ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendPointDto sendPointVo = discountDTO.getSendPointVo();
-            if (sendPointVo != null){
-                sendPoint.setMaxNum(sendPointVo.getMaxNum());
-                sendPoint.setSendPoint(sendPointVo.getSendPoint());
-                sendPoint.setValidityDateDays(sendPoint.getValidityDateDays());
-            }
-            sendPoint.setActivityCode(discountDTO.getActivityCode());
-            sendPoint.setEndTime(discountDTO.getEndTime());
+        SendPoint sendPointNew = new SendPoint();
+
+        ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendPointDto sendPointVo = discountDTO.getSendPointVo();
+        if (sendPointVo != null) {
+            sendPointNew.setMaxNum(sendPointVo.getMaxNum());
+            sendPointNew.setSendPoint(sendPointVo.getSendPoint());
+            sendPointNew.setValidityDateDays(sendPointVo.getValidityDateDays());
         }
     }