卡券配置接口

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.gic.enterprise.error.ErrorCode;
+import com.gic.weimob.api.service.WeimobMemberService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -45,11 +46,11 @@ public class WmMallStoreController {
     @Autowired
     private MemberCardApiService memberCardApiService;
     @Autowired
-    private WeimobStoreSiteService weimobStoreSiteService;
-    @Autowired
     private WeimobMerchantService weimobMerchantService;
     @Autowired
     private MemberCouponApiService memberCouponApiService;
+    @Autowired
+    private WeimobMemberService weimobMemberService;
 
     @RequestMapping("/save-wm-store")
     public RestResponse save(WmStoreDTO dto) {
@@ -212,15 +213,31 @@ public class WmMallStoreController {
 
     /**
      * 重新发送卡券
-     * @param memberId
-     * @param cardTemplateStr 发送优惠券列表信息List<String> 其中的string元素为 微盟pid_cardTemplateId拼接成
-     * @param couponCode  非必填 ，不填时，微盟卡券自动生成券号
+     * @param mcuId
+     * @param couponId
+     * @param couponCode
+     * @param couponLogId
      * @return
      */
     @RequestMapping("send-coupon-reset")
-    public RestResponse sendCouponReset(String memberId, @RequestBody List<String> cardTemplateStr, String couponCode) {
+    public RestResponse sendCouponReset(String mcuId, String couponId, String couponCode, String couponLogId) {
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        return ResultControllerUtils.commonResult(weimobMemberService.sendCoupon(enterpriseId, Long.valueOf(mcuId),
+                Long.valueOf(couponId), Long.valueOf(couponLogId), couponCode));
+    }
+
+    /**
+     * 核销卡券
+     * @param mcuId
+     * @param couponCode
+     * @param couponLogId
+     * @return
+     */
+    @RequestMapping("consume-coupon")
+    public RestResponse consumeCoupon(String mcuId, String couponCode, String couponLogId) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
-        return null;
+        return ResultControllerUtils.commonResult(weimobMemberService.consumeCoupon(enterpriseId, Long.valueOf(mcuId),
+                Long.valueOf(couponLogId), couponCode));
     }
 
     /**

gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml

@@ -128,6 +128,7 @@
 
     <dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteService" id="weimobStoreSiteService" timeout="6000"/>
     <dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantService" id="weimobMerchantService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobMemberService" id="weimobMemberService" timeout="6000"/>
     <dubbo:reference interface="com.gic.marketing.api.service.coupon.MemberCouponApiService" id="memberCouponApiService" timeout="6000"/>
 
     <dubbo:reference interface="com.gic.store.service.ClerkApiService" id="clerkApiService" timeout="60000" />