Merge branch 'feature/2.0.6-农工商商品兑换券' into qa

# Conflicts:
#	order-application-service/pom.xml

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

@@ -10,4 +10,10 @@ public class CommonRedisKeyConstant {
      * 不需要授权得url
      */
     public final static String SAAS_NOT_AUTHORIZED_URL = "saas:micro:not:authorized:url";
+
+    /**
+     * 农工商流水号
+     */
+    public final static String NGS_FLOWNO_PARTNER_DATE_NO = "ngs:flowno:partner:date:no";
+
 }

order-application-service/src/main/java/cn/freemud/controller/CreateOrderController.java

 package cn.freemud.controller;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.vo.NgsSellCouponCreateOrderVo;
 import cn.freemud.entities.vo.SellCouponCreateOrderVo;
 import cn.freemud.service.impl.SellCouponOrderServiceImpl;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
@@ -43,4 +44,14 @@ public class CreateOrderController {
         return sellCouponOrderService.createOrder(requestVo);
     }
 
+    /**
+     * 农工商卖券订单创建
+     */
+    @ApiAnnotation(logMessage = "sellCouponOrderCreate")
+    @PostMapping("/ngs/sellCouponOrder/create")
+    public BaseResponse ngsSellCouponOrderCreate(@Validated @LogParams @RequestBody NgsSellCouponCreateOrderVo requestVo) {
+        return sellCouponOrderService.ngsCouponOrderCreate(requestVo);
+    }
+
+
 }

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

+package cn.freemud.entities;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class Active {
+
+    @JSONField(
+            name = "ActiveId"
+    )
+    private Integer ActiveId;
+    @JSONField(
+            name = "EBCode"
+    )
+    private String EBCode;
+    @JSONField(
+            name = "Type"
+    )
+    private Integer Type;
+    @JSONField(
+            name = "PartnerID"
+    )
+    private Integer PartnerID;
+    @JSONField(
+            name = "PlatformItemId"
+    )
+    private String PlatformItemId;
+    @JSONField(
+            name = "State"
+    )
+    private Integer State;
+    @JSONField(
+            name = "CreateUser"
+    )
+    private String CreateUser;
+    @JSONField(
+            name = "CreateDate"
+    )
+    private String CreateDate;
+    @JSONField(
+            name = "LastEditUser"
+    )
+    private String LastEditUser;
+    @JSONField(
+            name = "LastEditDate"
+    )
+    private String LastEditDate;
+    @JSONField(
+            name = "ActiveCode"
+    )
+    private String ActiveCode;
+    @JSONField(
+            name = "ActiveName"
+    )
+    private String ActiveName;
+    @JSONField(
+            name = "StartDate"
+    )
+    private String StartDate;
+    @JSONField(
+            name = "EndDate"
+    )
+    private String EndDate;
+    @JSONField(
+            name = "ShouldRedeemAll"
+    )
+    private Boolean ShouldRedeemAll;
+    @JSONField(
+            name = "PromotionType"
+    )
+    private String PromotionType;
+    @JSONField(
+            name = "Exclusive"
+    )
+    private Boolean Exclusive;
+    @JSONField(
+            name = "MinAmount"
+    )
+    private BigDecimal MinAmount;
+    @JSONField(
+            name = "MaxRedeemTimes"
+    )
+    private Integer MaxRedeemTimes;
+    @JSONField(
+            name = "MaxSendOut"
+    )
+    private Integer MaxSendOut;
+    @JSONField(
+            name = "Cost"
+    )
+    private BigDecimal Cost;
+    @JSONField(
+            name = "BusinessID"
+    )
+    private Integer BusinessID;
+    @JSONField(
+            name = "ActiveDesc"
+    )
+    private String ActiveDesc;
+    @JSONField(
+            name = "Percentage"
+    )
+    private Double percentage;
+    @JSONField(
+            name = "Inventory"
+    )
+    private Integer inventory;
+    @JSONField(
+            name = "PercentDiscount"
+    )
+    private BigDecimal PercentDiscount;
+    @JSONField(
+            name = "MaxDiscount"
+    )
+    private Integer MaxDiscount;
+    @JSONField(
+            name = "AppId"
+    )
+    private String AppId;
+    @JSONField(
+            name = "FromDayEffective"
+    )
+    private Integer FromDayEffective;
+    @JSONField(
+            name = "Effective"
+    )
+    private Integer Effective;
+    @JSONField(
+            name = "EffectiveStart"
+    )
+    private Date EffectiveStart;
+    @JSONField(
+            name = "EffectiveEnd"
+    )
+    private Date EffectiveEnd;
+    @JSONField(
+            name = "RedeemChannel"
+    )
+    private String RedeemChannel;
+    @JSONField(
+            name = "MerchantDiscountPrice"
+    )
+    private BigDecimal MerchantDiscountPrice;
+    @JSONField(
+            name = "PlatformDiscountPrice"
+    )
+    private BigDecimal PlatformDiscountPrice;
+    @JSONField(
+            name = "OtherDiscountPrice"
+    )
+    private BigDecimal OtherDiscountPrice;
+
+    @JSONField(
+            name = "salePrice"
+    )
+    private Integer salePrice;
+    @JSONField(
+            name = "voucherFaceValue"
+    )
+    private Integer voucherFaceValue;
+
+}

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

+package cn.freemud.entities;
+
+import java.util.List;
+
+public class BatchQueryActivityInfoResponse {
+
+    /**
+     * 状态码
+     */
+    private String statusCode;
+
+    /**
+     * 状态码描述
+     */
+    private String msg;
+
+    private List<Active> activities;
+
+}

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

 package cn.freemud.entities.dto;
 
-import com.freemud.card.sdk.vo.coupon.Active;
+import cn.freemud.entities.Active;
 import lombok.Data;
 
 import java.util.List;

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

@@ -80,6 +80,10 @@ public class GetCouponDetailResponseDto {
         private String startString;
         @JsonProperty("State")
         private Integer state;
+        @JsonProperty("SalePrice")
+        private Integer salePrice;
+        @JsonProperty("OriginalPrice")
+        private Integer originalPrice;
         @JsonProperty("Type")
         private Integer type;
     }

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+@Data
+public class NgsSellCouponCreateOrderVo {
+
+
+    @NotEmpty(message = "sessionId 不能为空")
+    private String sessionId;
+
+    /**
+     * svc 储值卡支付使用
+     */
+    private String cardCode;
+
+
+    @NotEmpty(message = "券号 不能为空")
+    private String activityCode;
+
+    /**
+     * 业务类型
+     */
+    @NotEmpty(message = "bizType 业务类型不能为空")
+    private String bizType;
+
+    /**
+     * 版本号
+     */
+//    @NotEmpty(message = "version 版本号不能为空")
+    private String version;
+
+    @NotEmpty(message = "appId")
+    private String appId;
+
+}

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

@@ -13,6 +13,8 @@
 
 package cn.freemud.service;
 
+import cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto;
+import cn.freemud.entities.dto.BatchQueryActivityInfoResponseDto;
 import cn.freemud.entities.dto.GetCouponDetailResponseDto;
 import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
 import cn.freemud.entities.vo.ActivityClassifyCouponBean;
@@ -31,6 +33,9 @@ public interface CouponService {
      */
     GetCouponDetailResponseDto getMemberCoupon(GetMemberCouponRequestVo requestVo);
 
+    BatchQueryActivityInfoResponseDto batchQueryActivityInfo(BatchQueryActivityInfoRequestDto requestDto);
+
+
     /**
      * 获取卡券服务商户密钥
      */

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

@@ -140,6 +140,15 @@ public class CheckOrder {
         return userLoginInfoDto;
     }
 
+    public AssortmentCustomerInfoVo getMemberNew(String sessionId) {
+        // 通过sessionId查询缓存中会员id
+        AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
+        if (userLoginInfoDto == null || StringUtils.isEmpty(userLoginInfoDto.getMemberId())) {
+            throw new ServiceException(ResponseResult.NOT_LOGIN);
+        }
+        return userLoginInfoDto;
+    }
+
     /**
      * 查询门店信息
      */

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

@@ -156,6 +156,24 @@ public class CouponServiceImpl implements CouponService {
         return null;
     }
 
+    @Override
+    public BatchQueryActivityInfoResponseDto batchQueryActivityInfo(BatchQueryActivityInfoRequestDto requestDto) {
+
+        String appSecret = this.getAppSecret(String.valueOf(requestDto.getPartnerId()));
+        // requestDto.setActiveCode(calActiveCodes);
+        // 书写逻辑
+        // requestDto.setPartnerId(Integer.valueOf(partnerId));
+        String sign = SignUtil.createMD5Sign(requestDto, appSecret);
+        requestDto.setSign(sign);
+
+        BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = cardBinClient.batchQueryActivityInfo(requestDto);
+        if (Objects.equals(batchQueryActivityInfoResponseDto.getStatusCode(), ResponseCodeConstant.RESPONSE_SUCCESS_0_STR)
+                && CollectionUtils.isNotEmpty(batchQueryActivityInfoResponseDto.getActivities())) {
+            return batchQueryActivityInfoResponseDto;
+        }
+        return null;
+    }
+
     /**
      * 获取会员服务的优惠券列表
      *

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

@@ -2231,7 +2231,7 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse = uSvcPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getUnionPayCard());
         } else if (totalAmount > 0 && StringUtils.isBlank(cardCode)) {
             String partnerPayOvertime = this.getPartnerPayOvertime(createPrepayRequestDto.getPartnerId());
-            orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId, partnerPayOvertime);
+            orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId, partnerPayOvertime, createPrepayRequestDto.getOrderExtInfoDTO());
         } else if (totalAmount > 0 && StringUtils.isNotBlank(cardCode)) {
             //svc卡支付
             orderPayResponse = svcPay(cardCode, createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, LogThreadLocal.getTrackingNo());
@@ -2393,10 +2393,13 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.error(ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getCode(), ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getMessage(), null);
     }
 
-    public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, String partnerPayOvertime) {
+    public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, String partnerPayOvertime, OrderExtInfoDto orderExtInfoDto) {
         OrderPayResponse orderPayResponse;
         try {
             UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId, partnerPayOvertime);
+            if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getStationId())) {
+                request.setStationId(orderExtInfoDto.getStationId());
+            }
             com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
             if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
                 log.error("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
@@ -2869,7 +2872,7 @@ public class OrderServiceImpl implements Orderservice {
         //唤起微信支付
         if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {
             String partnerPayOvertime = this.getPartnerPayOvertime(createOrderVo.getPartnerId());
-            orderPayResponse = getPreOrderPay(fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo(), cardAmount, fatherBeanListOne.getOid(), partnerPayOvertime);
+            orderPayResponse = getPreOrderPay(fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo(), cardAmount, fatherBeanListOne.getOid(), partnerPayOvertime, null);
             return orderPayResponse;
         }
         //储值卡支付

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

@@ -182,5 +182,10 @@ public class OrderExtInfoDto {
     private Integer sendPointMaxNum;
     private Integer sendPointValidityDateDays;
 
+    /**
+     * 唤起预支付设备号
+     */
+    private String stationId;
+
 
 }