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

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

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.6-SNAPSHOT</version>
+            <version>2.0.24-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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;
@@ -48,8 +49,8 @@ public class CreateOrderController {
      */
     @ApiAnnotation(logMessage = "sellCouponOrderCreate")
     @PostMapping("/ngs/sellCouponOrder/create")
-    public BaseResponse ngsSellCouponOrderCreate(@Validated @LogParams @RequestBody SellCouponCreateOrderVo requestVo) {
-        return sellCouponOrderService.createOrder(requestVo);
+    public BaseResponse ngsSellCouponOrderCreate(@Validated @LogParams @RequestBody NgsSellCouponCreateOrderVo requestVo) {
+        return sellCouponOrderService.ngsCouponOrderCreate(requestVo);
     }
 
 

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

@@ -15,11 +15,8 @@ public class NgsSellCouponCreateOrderVo {
      */
     private String cardCode;
 
-    @NotEmpty(message = "menuType 不能为空")
-    private String menuType;
 
-
-    @NotEmpty(message = "活动号 不能为空")
+    @NotEmpty(message = "券号 不能为空")
     private String activityCode;
 
     /**

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

@@ -139,6 +139,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/OrderServiceImpl.java

@@ -2273,7 +2273,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());
@@ -2435,10 +2435,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));
@@ -2909,7 +2912,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;
         }
         //储值卡支付