Merge branches 'feature/20211101_礼品卡消费记录渠道_wuping' and 'master' of…

Merge branches 'feature/20211101_礼品卡消费记录渠道_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/CombPayRequest.java

@@ -72,4 +72,10 @@ public class CombPayRequest {
     private String ver ="10";
     private String storeName;
     private Long merchantDiscount;
+
+    /**
+     * @see  com.freemud
+     * 下单所用小程序类型：1微信，2支付宝，3抖音")
+     */
+    private Integer applicationType;
 }

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

@@ -4172,6 +4172,7 @@ public class OrderAdapter {
         orderPayDto.setPlatforms(platforms);
         orderPayDto.setOut_order_no(orderBean.getOid());
         orderPayDto.setCardCode(cardNo);
+        orderPayDto.setApplicationType(getPayApplicationType(orderBean.getOrderClient()));
         return orderPayDto;
 
     }
@@ -4622,4 +4623,25 @@ public class OrderAdapter {
         return name;
     }
 
+    /**
+     * 礼品卡支付参数转化
+     */
+    public Integer getPayApplicationType(String orderClient) {
+        Integer applicationType = PayApplicationTypeEnum.WECHAT.getType();
+        switch (orderClient) {
+            case "2":
+                applicationType = PayApplicationTypeEnum.WECHAT.getType();
+                break;
+            case "3":
+                applicationType = PayApplicationTypeEnum.ALIPAY.getType();
+                break;
+            case "27":
+                applicationType = PayApplicationTypeEnum.BYTE_DANCE.getType();
+                break;
+            default:
+                break;
+        }
+        return applicationType;
+    }
+
 }

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

 package cn.freemud.entities.dto.order;
 
+import com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -32,6 +35,13 @@ public class FacePayRequestDto {
     private Long clientCode;
     private String code;
     private Long undisAmount;
-//    private List<CodePayRequest.PayProduct> products;
+    private String payCode;
+    private String cardPassword;
+    private Long merchantDiscount;
+
+    //下单所用小程序类型：1微信，2支付宝，3抖音 礼品卡支付新增，记录渠道
+    private Integer applicationType;
+
+    private List<CodePayRequest.PayProduct> products;
 
 }

order-application-service/src/main/java/cn/freemud/enums/PayApplicationTypeEnum.java

+package cn.freemud.enums;
+
+
+public enum PayApplicationTypeEnum {
+
+
+    WECHAT(1, "微信小程序"),
+    ALIPAY(2, "支付宝小程序"),
+    BYTE_DANCE(3, "抖音小程序"),
+
+    ;
+
+    private int type;
+    private String desc;
+
+    PayApplicationTypeEnum() {
+    }
+
+    PayApplicationTypeEnum(Integer type, String desc) {
+        this.type = type;
+        this.desc = desc;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

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

@@ -735,7 +735,7 @@ public class PayServiceImpl {
      * 纯储值卡或礼品卡支付
      */
     public OrderPayResponse svcPay(String cardCode, OrderBeanV1 orderBean, PaymentRequest paymentRequest, String transId, String trackingNo) {
-        CodePayRequest request = new CodePayRequest();
+        FacePayRequestDto request = new FacePayRequestDto();
         OrderPayResponse orderPayResponse = new OrderPayResponse();
         String partnerId = orderBean.getCompanyId();
         request.setBody(orderBean.getShopName());
@@ -749,6 +749,7 @@ public class PayServiceImpl {
         request.setOperatorId("1");
         request.setVer("2");
         request.setMerchantDiscount(orderBean.getOriginalAmount().longValue() - orderBean.getAmount());
+        request.setApplicationType(orderAdapter.getPayApplicationType(orderBean.getOrderClient()));
         SVCCardAmountRequestDto svcRequest = new SVCCardAmountRequestDto();
         svcRequest.setPartnerId(partnerId);
         svcRequest.setCardCodes(Arrays.asList(cardCode));
@@ -769,12 +770,13 @@ public class PayServiceImpl {
             return orderPayResponse;
         }
         //svc卡支付
-        com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> responseBase = paymentNewService.codePay(request, trackingNo);
-        if (responseBase == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode()) || responseBase.getData().getData() == null) {
+        com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> responseBase = paymentNewClient.codePay(request);
+        if (responseBase == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())
+                || responseBase.getData() == null ||  !Objects.equals(responseBase.getData().getResultCode(), ResponseCodeConstant.RESPONSE_SUCCESS)) {
             // 1.9.34 预支付失败需要把原因进行记录
             orderPayResponse.setMsg(Objects.isNull(responseBase) ? "卡支付异常" : responseBase.getMessage());
         } else {
-            CodePayResponse.CodePayDate codePayResponse = responseBase.getData().getData();
+            FacePayResponseDto codePayResponse = responseBase.getData();
             orderPayResponse.setFmId(codePayResponse.getFmId());
             orderPayResponse.setPayTransId(codePayResponse.getPayTransId());
             orderPayResponse.setWxAppid(paymentRequest.getWxAppId());

order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java

@@ -58,4 +58,10 @@ public interface PaymentNewClient {
     @PostMapping("paymentcenter/invoice/create")
     com.freemud.application.sdk.api.base.BaseResponse<InvoiceCreateResponse> createInvoice(@RequestBody InvoiceCreateRequest request);
 
+    //线下付，储值卡/礼品卡支付
+    @LogIgnoreFeign(logMessage="codePay",statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE)
+    @PostMapping("paymentcenter/codePay")
+    com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> codePay(@RequestBody FacePayRequestDto orderPayDto);
+
+
 }

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

@@ -35,6 +35,7 @@ public class GetCouponDetailResponseDto {
         private Integer storeChannelLimit;
         private Active active;
         private List<ActiveProduct> activeProduct;
+        //活动门店限制（非发券指定门店活动使用）
         private List<ActiveRestrictionVOS> activeRestrictionVOS;
         /**
          * 可核销周,时间段设置
@@ -66,6 +67,8 @@ public class GetCouponDetailResponseDto {
         private List<ActiveChannel> activeChannels;
 //        private List<ActiveRedeemTimeIntervalVO> activeRedeemTimeIntervalList;
         private Integer storeLimitLevel;
+        //为0可用
+        private Integer storelimit;
         private String limitStoreId;
 //        private Integer today_available_times;
         private Integer total_available_times;

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/GetMemberCouponRequestVo.java

@@ -18,4 +18,7 @@ public class GetMemberCouponRequestVo {
     private String couponCode;
     // 门店ID
     private String storeId;
+
+    //是否 校验券门店是否可用
+    private Boolean checkStoreId = false;
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/CouponService.java

@@ -20,21 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface CouponService {
-    /**
-     * 获取优惠券列表
-     *
-     * @param getMemberCouponListRequestVo
-     * @return
-     */
-//    BaseResponse<GetMemberCouponListResponseVo> getCouponList(GetMemberCouponListRequestVo getMemberCouponListRequestVo);
 
-    /**
-     * 添加到微信卡包
-     *
-     * @param requestVo
-     * @return
-     */
-//    AddWeiXinCardResponseVo addWeiXinCard(AddWeiXinCardRequestVo requestVo);
 
     /**
      * 获取卡券详情
@@ -47,40 +33,6 @@ public interface CouponService {
     List<GetMemberCouponListResponseDto.Result.MemberCoupon> getValidMemberCouponList(GetMemberCouponListRequestDto getMemberCouponListRequestDto, Integer orderType);
 
     /**
-     * 批次查询券详情
-     *
-     * @param partnerId
-     * @param storeId
-     * @param codes
-     * @return
-     */
-    List<GetCouponDetailResponseDto.Details> getMemberCoupons(String partnerId, String storeId, List<String> codes);
-
-    /**
-     * 获取麦咖啡卡券详情
-     *
-     * @param requestVo
-     * @return
-     */
-//    GetCouponDetailResponseDto getMCCafeMemberCoupon(GetMemberCouponRequestVo requestVo);
-
-    /**
-     * 同步券到会员卡包(投放会员卡包)
-     *
-     * @param requestVo
-     * @return
-     */
-//    BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo);
-
-    /**
-     * 调用会员接口列表
-     *
-     * @param cartGoods
-     * @return
-     */
-    //ActivityClassifyCouponBean availableCoupon(List<CartGoods> cartGoods, String partnerId, String userId, String storeId, String couponCode, boolean hasGoodsCoupon, Integer orderType, int isNew,String appId,String MenuType, String unChooseCouponCode);
-
-    /**
      * 调用会员接口列表
      *
      * @param cartGoods
@@ -93,18 +45,6 @@ public interface CouponService {
      */
     String getAppSecret(String partnerId);
 
-    /**
-     * 获取卡券服务麦咖啡商户密钥
-     */
-//    String getMCCafeAppSecret(String partnerId);
-
-    /**
-     * 通过code校验券是否存在，返回商品券信息pid、price、code
-     *
-     * @param requestDto
-     * @return
-     */
-//    CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto);
 
     CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto, String goodsId);
 
@@ -113,17 +53,6 @@ public interface CouponService {
 
     GetProductsVo getSpqProductInfo(CheckSpqInfoRequestDto requestDto, String goodsId);
 
-//    /**
-//     * 领券
-//     *
-//     * @param activityCodes
-//     * @param partnerId
-//     * @param storeId
-//     * @param mobile
-//     * @param userId
-//     */
-//    List<CreateCouponBeanVo> createCoupon(List<ActivityDiscountDto> activityCodes, String partnerId, String storeId, String mobile, String userId);
-
 
     GetCouponBarCodeResponseVo getCouponBarCode(String couponCode);
 
@@ -136,5 +65,4 @@ public interface CouponService {
      */
     Map<String, Boolean> couponOrderWay(String partnerId, List<String> activityCodes, Integer orderTye);
 
-    void checkValidCoupon(CouponPromotionVO couponPromotionVO, List<String> couponList, Map<String, List<String>> spqIdToCartUuid, String couponCode, List<CartGoods> cartGoodsList);
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOnlineClient.java

 package cn.freemud.service.thirdparty;
 
 
-//import cn.freemud.constant.IgnoreFeignLogAnnotation;
 import cn.freemud.annotations.IgnoreFeignLogAnnotation;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.constant.ResponseCodeKeyConstant;
@@ -10,12 +9,10 @@ import cn.freemud.interceptor.FormSupportConfig;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
-//@IgnoreFeignLogAnnotation
 @FeignClient(name = "OPEN-STORE-ONLINE-COUPON-SERVICE", url = "${saas.coupononlineclient.feign.url}", configuration = FormSupportConfig.class)
 public interface CouponOnlineClient {
     /**

shopping-cart-application-service/src/test/java/cn.freemud/service/CouponServiceTest.java

@@ -94,11 +94,11 @@ public class CouponServiceTest {
         assertEquals(getCouponDetailResponseDto.getStatusCode().toString(), "100");
     }
 
-    @Test
-    public void getMemberCoupons() {
-        List<GetCouponDetailResponseDto.Details> details = couponService.getMemberCoupons("1864", "1001",Arrays.asList("8812412","88141242"));
-        assertTrue(CollectionUtils.isNotEmpty(details));
-    }
+//    @Test
+//    public void getMemberCoupons() {
+//        List<GetCouponDetailResponseDto.Details> details = couponService.getMemberCoupons("1864", "1001",Arrays.asList("8812412","88141242"));
+//        assertTrue(CollectionUtils.isNotEmpty(details));
+//    }
 
 //    @Test
 //    public void receiveMemberCoupon() {