Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,7 @@ 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.entities.vo.SellCouponSvcConfigVo;
 import cn.freemud.service.impl.SellCouponOrderServiceImpl;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
@@ -43,6 +44,15 @@ public class CreateOrderController {
     }
 
     /**
+     * 卖券订单创建查询是否支持储值卡  （临时方案，后续）
+     */
+    @ApiAnnotation(logMessage = "svcConfig")
+    @PostMapping("/sellCouponOrder/svcConfig")
+    public BaseResponse svcConfig(@Validated @LogParams @RequestBody SellCouponSvcConfigVo requestVo) {
+        return sellCouponOrderService.svcConfig(requestVo);
+    }
+
+    /**
      * 农工商卖券订单创建
      */
     @ApiAnnotation(logMessage = "sellCouponOrderCreate")

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

@@ -57,4 +57,9 @@ public class PayGiftCouponVo {
      * 起用金额
      */
     private String minAmount;
+
+    /**
+     * 活动描述
+     */
+    private String activityDesc;
 }

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+@Data
+public class SellCouponSvcConfigVo {
+
+    @NotEmpty(message = "sessionId 不能为空")
+    private String sessionId;
+
+}

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+@Data
+public class SvcConfigResponse {
+    private boolean svcPay;
+
+    public SvcConfigResponse() {
+    }
+
+    public SvcConfigResponse(boolean svcPay) {
+        this.svcPay = svcPay;
+    }
+}

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

@@ -202,6 +202,7 @@ public enum ResponseResult {
      * 支付
      */
     PAY_BACKEND_CONFIG_ERROR("58003", "支付交易异常","Abnormal payment transaction"),
+    PAY_SVC_CONFIG_ERROR("58004", "不支持储值卡支付",""),
     /**
      * 优惠券活动
      */

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

@@ -16,10 +16,7 @@ import cn.freemud.entities.dto.product.ProductInfo;
 import cn.freemud.entities.dto.product.ValidateProductInfosDto;
 import cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto;
 import cn.freemud.entities.dto.promotion.CalculationDiscountRequestDto;
-import cn.freemud.entities.vo.CreateOrderVo;
-import cn.freemud.entities.vo.NgsSellCouponCreateOrderVo;
-import cn.freemud.entities.vo.PaysuccessNoticeMessage;
-import cn.freemud.entities.vo.SellCouponCreateOrderVo;
+import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.enums.integralproduct.IntegralProductStatusEnum;
 import cn.freemud.interceptor.ServiceException;
@@ -152,6 +149,9 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
     private List<String> buyProductOncePartnerIds;
 
 
+    @Value("#{'${virtual.product.svc.pay.partnerId:}'.split(',')}")
+    private List<String> virtualProductSvcPayPartnerId;
+
     private final String SUCCESS = "100";
 
     private final String ngsCouponProductId = "76161384";
@@ -276,6 +276,21 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
     }
 
     /**
+     * 获取用户所在的商户是否支持储值卡买券
+     *
+     * @param requestVo
+     * @return
+     */
+    public BaseResponse svcConfig(SellCouponSvcConfigVo requestVo) {
+        // 查询用户信息
+        AssortmentCustomerInfoVo userLoginInfoDto = checkOrder.checkOrderByMemberNew(requestVo.getSessionId());
+        if (CollectionUtils.isNotEmpty(virtualProductSvcPayPartnerId) && !virtualProductSvcPayPartnerId.contains(userLoginInfoDto.getPartnerId())) {
+            return ResponseUtil.success(new SvcConfigResponse(false));
+        }
+        return ResponseUtil.success(new SvcConfigResponse(true));
+    }
+
+    /**
      * 卖券订单创建
      */
     public BaseResponse createOrder(SellCouponCreateOrderVo requestVo){
@@ -287,6 +302,9 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         String partnerId = userLoginInfoDto.getPartnerId();
         String storeId = requestVo.getShopId();
         String userId = userLoginInfoDto.getMemberId();
+        if (StringUtils.isNotBlank(requestVo.getCardCode()) && CollectionUtils.isNotEmpty(virtualProductSvcPayPartnerId) && !virtualProductSvcPayPartnerId.contains(partnerId)) {
+            return ResponseUtil.error(ResponseResult.PAY_SVC_CONFIG_ERROR);
+        }
         //查询门店信息
         StoreInfoRequest storeInfoRequest = new StoreInfoRequest(partnerId, storeId,null);
         StoreResponse storeResponse = storeCenterService.getStoreInfo(storeInfoRequest, trackingNo);

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

@@ -228,6 +228,7 @@ public class CouponPromotionService implements IPromotionService {
                         if (activityDiscountsDto != null) {
                             ActivityDiscountsDto activityDiscountsDto1 = new ActivityDiscountsDto();
                             BeanUtils.copyProperties(activityDiscountsDto, activityDiscountsDto1);
+                            //商品级别优惠为正数
                             activityDiscountsDto1.setDiscountAmount(-activityDiscountsDto.getDiscountAmount());
 
                             cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
@@ -269,6 +270,7 @@ public class CouponPromotionService implements IPromotionService {
                 activityDiscountsDto.setActivityCode(apportionDetails.getActivityCode());
                 activityDiscountsDto.setActivityName(apportionDetails.getActivityName());
                 activityDiscountsDto.setActivityType(this.convent2ActivityType(apportionDetails.getActivityType()));
+                //订单活动级别优惠为负值
                 activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscountAmount());
                 return activityDiscountsDto;
             }
@@ -285,7 +287,8 @@ public class CouponPromotionService implements IPromotionService {
                 activityDiscountsDto.setActivityCode(discounts.get(0).getActivityCode());
                 activityDiscountsDto.setActivityName(discounts.get(0).getActivityName());
                 activityDiscountsDto.setActivityType(this.convent2ActivityType(discounts.get(0).getType()));
-                activityDiscountsDto.setDiscountAmount(0 - discounts.get(0).getDiscount().intValue());
+                //商品级别优惠为正数
+                activityDiscountsDto.setDiscountAmount(discounts.get(0).getDiscount().intValue());
                 activityDiscountsDto.setActualActivityGoodsNumber(discounts.get(0).getActualGoodsNumber());
                 activityDiscountsDto.setCartGoodsUid(goods1.getCartGoodsUid());