Merge remote-tracking branch 'origin/develop' into develop

order-application-service/pom.xml

@@ -315,7 +315,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>paymentcenter-sdk</artifactId>
-            <version>2.8.RELEASE</version>
+            <version>2.8.1-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

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

@@ -13,8 +13,9 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.UserDeliveryInfoDto;
-import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
 import lombok.Builder;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
@@ -225,18 +226,22 @@ public class CreateOrderVo {
      * 是否使用银联礼品卡,如果不为空则为使用
      */
     @Valid
+    @ApiModelProperty(value = "银联礼品卡")
     private UnionPayCard unionPayCard;
 
     /**
      * 银联礼品卡
      */
     @Data
+    @ApiModel(value = "银联礼品卡类", description = "如果传了礼品卡字段,此类中属性必传")
     public static class UnionPayCard {
 
         @NotNull(message = "银联礼品卡手机号必传")
-        private String phoneNumber;
+        @ApiModelProperty(value = "银联礼品卡手机号",required = true)
+        private String code;
 
         @NotNull(message = "银联礼品卡密码必传")
+        @ApiModelProperty(value = "银联礼品卡密码",required = true)
         private String password;
     }
 

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

@@ -2211,7 +2211,7 @@ public class OrderServiceImpl implements Orderservice {
      */
     private OrderPayResponse upcPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String transId, String trackingNo, CreateOrderVo.UnionPayCard unionPayCard) {
         OrderPayResponse orderPayResponse = new OrderPayResponse();
-        if (Objects.isNull(unionPayCard) || StringUtils.isBlank(unionPayCard.getPhoneNumber()) || StringUtils.isBlank(unionPayCard.getPassword())) {
+        if (Objects.isNull(unionPayCard) || StringUtils.isBlank(unionPayCard.getCode()) || StringUtils.isBlank(unionPayCard.getPassword())) {
             orderPayResponse.setMsg("银联礼品卡信息缺失");
             return orderPayResponse;
         }
@@ -2219,8 +2219,9 @@ public class OrderServiceImpl implements Orderservice {
         String partnerId = orderBean.getCompanyId();
         request.setBody(orderBean.getShopName());
         request.setBusinessDate(DateTimeFormatter.ofPattern(DateUtil.FORMAT_YYYY_MM_DD_HHMMSS).format(LocalDateTime.now()));
-//        request.setCode(unionPayCard.getPhoneNumber());
-        request.setCode(paymentRequest.getOpenId());
+        // 礼品卡信息
+        request.setCode(unionPayCard.getCode());
+        request.setCardPassword(unionPayCard.getPassword());
         request.setPartnerId(partnerId);
         request.setStoreId(orderBean.getShopId());
         request.setAmount(orderBean.getAmount());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java

@@ -104,7 +104,7 @@ public class SetMealCalculation {
 //                totalDiscountAmount += discountAmount - productGroupDiscountAmount * cartGoods.getQty();
                 // 添加套餐父商品
                 ShoppingCartGoodsDto.CartGoodsDetailDto parentCartGoods = shoppingCartConvertAdapter.convertCartGoods2DetailGoods(cartGoods, apportionGoods,duplicateGoodsMap);
-                parentCartGoods.setTotalDiscountAmount(parentCartGoods.getTotalDiscountAmount()+ cartGoods.getOriginalAmount().intValue() - cartGoods.getAmount().intValue());
+//                parentCartGoods.setTotalDiscountAmount(parentCartGoods.getTotalDiscountAmount()+ cartGoods.getOriginalAmount().intValue() - cartGoods.getAmount().intValue());
 //                parentCartGoods.getActivityDiscountsDtos().add(getActivityDiscountsDto(discountAmount - productGroupDiscountAmount * cartGoods.getQty()));
                 // 添加套餐固定商品&可选商品: 做均摊
                 parentCartGoods.setComboProducts(shoppingCartConvertAdapter.convertComboxGoods2DetailGoods(cartGoods,parentCartGoods.getTotalDiscountAmount()));

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java

@@ -102,7 +102,8 @@ public class TimeSaleCalculation {
      * 商品均摊
      */
     public void updateShoppingCartGoodsApportion(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto){
-        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts()) || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_2.getCode().equals(discount.getType()) || ActivityTypeEnum.TYPE_21.getCode().equals(discount.getType())))) {
+        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts()) || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_2.getCode().equals(discount.getType())
+                || ActivityTypeEnum.TYPE_21.getCode().equals(discount.getType()) || ActivityTypeEnum.TYPE_23.getCode().equals(discount.getType())))) {
             return;
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();