Merge branch 'feature-储值卡增加积分配置ID1039801-zxh-20211124'

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java

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

@@ -1882,16 +1882,19 @@ public class OrderAdapter {
                 OrderAccountVo accountVo = new OrderAccountVo();
                 Integer type = orderSettlement.getSettlementType();
                 accountVo.setType(type);
-                if (type == OrderSettlementType.PRODUCT_COUPON.getIndex() || type == OrderSettlementType.CASH_COUPON.getIndex()
-                        || type == OrderSettlementType.DISCOUNT_COUPON.getIndex()) {
+                if (type.compareTo(OrderSettlementType.PRODUCT_COUPON.getIndex()) == 0
+                        || type.compareTo(OrderSettlementType.CASH_COUPON.getIndex()) == 0
+                        || type.compareTo(OrderSettlementType.DISCOUNT_COUPON.getIndex()) == 0 ){
                     // fisherman ->修改成券名称
                     accountVo.setTypeName(StringUtils.isEmpty(orderSettlement.getNote()) ? "优惠券" : orderSettlement.getNote());
-                } else if (type == OrderSettlementType.FULL_REDUCTION.getIndex()) {
+                } else if (type.compareTo(OrderSettlementType.FULL_REDUCTION.getIndex())==0) {
                     accountVo.setTypeName("满减");
-                } else if (type == OrderSettlementType.POINTS.getIndex()) {
+                } else if (type.compareTo(OrderSettlementType.POINTS.getIndex())==0) {
                     accountVo.setTypeName("积分抵扣");
-                } else if (type == OrderSettlementType.FREIGHT_COUPON.getIndex()) {
+                } else if (type.compareTo(OrderSettlementType.FREIGHT_COUPON.getIndex())==0) {
                     accountVo.setTypeName("配送券");
+                }else {
+                    accountVo.setTypeName("参与活动");
                 }
                 int value = orderSettlement.getSettlementAmount().intValue();
                 accountVo.setDiscountAmount(value < 0 ? -value : value);

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

@@ -27,19 +27,19 @@ public class FastTemplateInfoResponseVO {
     private Integer subType;
 
     @ApiModelProperty(value = "固定有效期开始时间，格式YYYY-MM-DD HH:mm:ss", required = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date effectiveStartTime;
 
     @ApiModelProperty(value = "固定有效结束时间，格式YYYY-MM-DD HH:mm:ss", required = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date effectiveEndTime;
 
     @ApiModelProperty(value = "领券结束时间，格式YYYY-MM-DD HH:mm:ss", required = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date receiveEndTime;
 
     @ApiModelProperty(value = "领券开始时间，格式YYYY-MM-DD HH:mm:ss", required = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date receiveStartTime;
 
     @ApiModelProperty(value = "启用金额，单位：分", required = true)

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

@@ -200,6 +200,9 @@ public class PayServiceImpl {
         }
         createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, createPrepayRequestDto.getProductOrderBean());
         //更新订单支付信息
+        if (Objects.nonNull(createPrepayRequestDto.getOrderExtInfoDTO()) &&  StringUtils.isNotBlank(cardCode)) {
+            createPrepayRequestDto.getOrderExtInfoDTO().setCardCode(cardCode);
+        }
         BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());
         if (baseEditResponse != null) {
             throw new ServiceException(baseEditResponse.getCode(), baseEditResponse.getMessage());

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

@@ -221,4 +221,9 @@ public class OrderExtInfoDto {
      * 包装费 收费规则　1= 商品级别 2=订单级别
      */
     private Integer packageAmountCollectType;
+
+    /**
+     * svc卡支付时使用的 cardCode
+     */
+    private String cardCode;
 }