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;
         }
         //储值卡支付

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

@@ -4,9 +4,12 @@ import cn.freemud.adapter.LightApplicationConvertToAssortmentSdkAdapter;
 import cn.freemud.adapter.OrderAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
+import cn.freemud.constant.CommonRedisKeyConstant;
 import cn.freemud.entities.dto.ConfirmOrderDto;
+import cn.freemud.entities.dto.GetCouponDetailResponseDto;
 import cn.freemud.entities.dto.QueryOrdersResponseDto;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
+import cn.freemud.entities.vo.GetMemberCouponRequestVo;
 import cn.freemud.entities.vo.NgsSellCouponCreateOrderVo;
 import cn.freemud.entities.vo.PaysuccessNoticeMessage;
 import cn.freemud.entities.vo.SellCouponCreateOrderVo;
@@ -15,6 +18,7 @@ import cn.freemud.enums.ResponseResult;
 import cn.freemud.enums.UserLoginChannelEnum;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
+import cn.freemud.service.CouponService;
 import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.ResponseUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -61,9 +65,14 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -99,13 +108,23 @@ public class SellCouponOrderServiceImpl {
     private OrderAdapter orderAdapter;
     @Autowired
     private OrderSdkAdapter orderSdkAdapter;
-
-
+    @Autowired
+    private static RedisTemplate redisTemplate;
+    @Autowired
+    private CouponService couponService;
 
 
     @Value("${coupon.app.id}")
     private String appId;
 
+    @Value("#{${ngs.virtual.store.idmap:null}}")
+    private Map<String, String> storeIdMap;
+    @Value("${ngs.partnerId.easy}")
+    private String easyPartnerId;
+    @Value("${ngs.partnerId.supermarket}")
+    private String supermarketPartnerId;
+
+
     private final String SUCCESS = "100";
 
     private final String ngsCouponProductId = "76161384";
@@ -215,10 +234,8 @@ public class SellCouponOrderServiceImpl {
     public BaseResponse ngsCouponOrderCreate(NgsSellCouponCreateOrderVo requestVo){
 
         // 查询用户信息、校验svc卡
-        AssortmentCustomerInfoVo userLoginInfoDto = checkOrder.checkOrderByMemberNew(requestVo.getSessionId(), requestVo.getCardCode());
+        AssortmentCustomerInfoVo userLoginInfoDto = checkOrder.getMemberNew(requestVo.getSessionId());
 
-        // TODO 通过活动号查询金额
-        String activityCode = requestVo.getActivityCode();
         String trackingNo = LogThreadLocal.getTrackingNo();
         String partnerId = userLoginInfoDto.getPartnerId();
 
@@ -238,7 +255,6 @@ public class SellCouponOrderServiceImpl {
         createPrepayRequestDto.setTransId(orderInfoReqsBaseResponse.getResult().getOrderCode());
         createPrepayRequestDto.setWxAppId(userLoginInfoDto.getWxAppId());
         createPrepayRequestDto.setOpenId(userLoginInfoDto.getOpenId());
-//        createPrepayRequestDto.setFaceCode(null);
         createPrepayRequestDto.setCardCode(requestVo.getCardCode());
         createPrepayRequestDto.setPayCode(null);
         createPrepayRequestDto.setFatherOrderBean(createOrderResponse.getData());
@@ -265,11 +281,48 @@ public class SellCouponOrderServiceImpl {
         orderExtInfoDto.setSessionKey(userLoginInfoDto.getSessionKey());
         orderExtInfoDto.setFromAppId(userLoginInfoDto.getWxAppId());
 
+        String date = DateUtil.convert2String(new Date(), "yyyy-MM-dd");
+        String key = this.getFolwNo(partnerId, date);
+
+        int flowno = 0;
+
+        if (redisTemplate.opsForValue().setIfAbsent(key, 0)) {
+            redisTemplate.expire(key, 24, TimeUnit.HOURS);
+        } else {
+            flowno = redisTemplate.opsForValue().increment(key, 1).intValue();
+        }
+        String stationid = getStationId(date, partnerId, flowno);
+
+        orderExtInfoDto.setStationId(stationid);
+
         createPrepayRequestDto.setOrderExtInfoDTO(orderExtInfoDto);
         return orderservice.createPrepayOrder(createPrepayRequestDto);
 
     }
 
+    private String getStationId(String date, String partnerId, int flowno) {
+        String stationid = "";
+        int length = String.valueOf(flowno).length();
+        if (easyPartnerId.equals(partnerId)){
+            stationid = date + "6600000001";
+            for (int i = 0; i < 5 - length; i++){
+                stationid += "0";
+            }
+            stationid += flowno;
+        } else if (supermarketPartnerId.equals(partnerId)) {
+            stationid = date + "9988800001";
+            for (int i = 0; i < 5 - length; i++){
+                stationid += "0";
+            }
+            stationid += flowno;
+        }
+        return stationid;
+    }
+
+    private String getFolwNo(String partnerId, String date){
+        return CommonRedisKeyConstant.NGS_FLOWNO_PARTNER_DATE_NO + ":" + partnerId + ":" + date;
+    }
+
     /**
      * 批量查询活动详情
      *
@@ -447,6 +500,9 @@ public class SellCouponOrderServiceImpl {
 
 
     private CreateOrderRequest ngsConvent2NEWCreateOrderRequest(NgsSellCouponCreateOrderVo requestVo, AssortmentCustomerInfoVo userLoginInfoDto){
+
+
+
         CreateOrderRequest request = new CreateOrderRequest();
         Integer orderClient = OrderClientType.SAAS.getIndex();
         if(UserLoginChannelEnum.ALIPAY.getCode().equals(userLoginInfoDto.getChannel())){
@@ -458,7 +514,7 @@ public class SellCouponOrderServiceImpl {
         String partnerId = userLoginInfoDto.getPartnerId();
         request.setOrderClient(orderClient);
         request.setPartnerId(partnerId);
-        request.setStoreId(null); // TODO 虚拟门店
+        request.setStoreId(storeIdMap.get(partnerId));
         //买券虚拟订单
         request.setBizType(6);
         //1:线上支付 2:线下支付
@@ -474,20 +530,29 @@ public class SellCouponOrderServiceImpl {
             request.setPayChannelName("储值卡支付");
         }
         // TODO 商品信息 从券码查
+        // TODO 通过活动号查询金额
+        String activityCode = requestVo.getActivityCode();
+
+        GetCouponDetailResponseDto memberCoupon = couponService.getMemberCoupon(GetMemberCouponRequestVo.builder()
+                .partnerId(partnerId)
+                .couponCode(activityCode).build());
+        GetCouponDetailResponseDto.Active active = memberCoupon.getDetails().get(0).getActive();
         // GetMenuCategoryInfoResponse.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean productBean = productInfosResponse.getProducts().get(0);
         //订单原始金额，单位分
         //用户在界面上看到的支付金额
-        request.setSettlementAmount(null); // TODO
+
+
+        request.setSettlementAmount(active.getSalePrice().longValue());
         //实际支付现金金额，扣除支付自生优惠，单位分`
-        request.setActualPayAmount(null); // TODO
-        request.setOriginalAmount(null); // TODO
+        request.setActualPayAmount(active.getSalePrice().longValue());
+        request.setOriginalAmount(active.getOriginalPrice().longValue());
         request.setOrderType(OrderType.GENERAL_DINE_IN.getIndex());
         //商品信息转换
         List<OrderItemCreateReq> orderItemList = new ArrayList<>();
         OrderItemCreateReq orderItemCreateReq = new OrderItemCreateReq();
-        orderItemCreateReq.setSalePrice(null); // TODO
-        orderItemCreateReq.setProductPrice(null); // TODO
-        orderItemCreateReq.setSettlementPrice(null); // TODO
+        orderItemCreateReq.setSalePrice(active.getSalePrice().longValue());
+        orderItemCreateReq.setProductPrice(active.getOriginalPrice().longValue());
+        orderItemCreateReq.setSettlementPrice(active.getSalePrice().longValue());
         orderItemCreateReq.setPartnerId(partnerId);
 
         orderItemCreateReq.setProductId(ngsCouponProductId);
@@ -499,27 +564,18 @@ public class SellCouponOrderServiceImpl {
         orderItemCreateReq.setThirdProductId("");
         orderItemCreateReq.setProductQuantity(1);
 
-        /* TODO 添加发券信息
         OrderProductAddInfoDto orderProductAddInfoDto = new OrderProductAddInfoDto();
         List<ProductBindingCouponType> productBindingCoupons = new ArrayList<>();
-        for (GetMenuCategoryInfoResponse.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean.ProductBindingCouponType productBindingCouponType : productBean.getProductBindingCouponTypes()){
-            for (ActiveDetailVO activeDetailVO : activeDetailVOS){
-                if(productBindingCouponType.getActivityCode().equals(activeDetailVO.getActiveCode())){
-                    ProductBindingCouponType productBindingCouponType2 = new ProductBindingCouponType();
-                    productBindingCouponType2.setActivityCode(productBindingCouponType.getActivityCode());
-                    productBindingCouponType2.setNum(productBindingCouponType.getNum());
-                    productBindingCouponType2.setActivityName(activeDetailVO.getActiveName());
-                    productBindingCoupons.add(productBindingCouponType2);
-                    break;
-                }
-            }
-        }
+        GetCouponDetailResponseDto.Details detail = memberCoupon.getDetails().get(0);
+        ProductBindingCouponType productBindingCouponType2 = new ProductBindingCouponType();
+        productBindingCouponType2.setActivityCode(detail.getActiveCode());
+        productBindingCouponType2.setNum(1);
+        productBindingCouponType2.setActivityName(detail.getActive().getActiveName());
+        productBindingCoupons.add(productBindingCouponType2);
         orderProductAddInfoDto.setProductBindingCoupons(productBindingCoupons);
         orderItemCreateReq.setExtInfo(JSONObject.toJSONString(orderProductAddInfoDto));
         orderItemList.add(orderItemCreateReq);
 
-         */
-
         //商品信息赋值
         request.setOrderItemList(orderItemList);
         //收货人信息转换
@@ -544,7 +600,6 @@ public class SellCouponOrderServiceImpl {
         request.setAppId(userLoginInfoDto.getWxAppId());
         return request;
 
-
     }
 
     /**
@@ -619,5 +674,11 @@ public class SellCouponOrderServiceImpl {
         return couponDetailResponse.getData().getDetails();
     }
 
+    private Long pointToFen(double price) {
+        DecimalFormat df = new DecimalFormat("#.00");
+        price = Double.valueOf(df.format(price));
+        long money = (long) (price * 100);
+        return money;
+    }
 
 }