[卡密][修改]:卡密获取卡券出问题后，恢复原有状态

mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java

@@ -29,10 +29,12 @@ public class WxCouponPasswordController extends BaseController {
 
     @Autowired
     private WxCouponService couponService;
+
     @Autowired
     private WxOrderService orderService;
 
 
+
     @ApiOperation(value = "根据卡密领卡", notes = "{\"password\":\"String\",\"formId\":\"String\"}")
     @PostMapping("getCouponOrderByPassword")
     public ResultData getCouponOrderByPassword(@RequestBody Map<String, String> params) {
@@ -68,28 +70,31 @@ public class WxCouponPasswordController extends BaseController {
             return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF);
         }
 
-        // 2. 设置已使用
-        try {
-            WxCouponPassword updateCouponPwd = new WxCouponPassword();
-            updateCouponPwd.setId(couponPassword.getId());
-            updateCouponPwd.setStatus(EnumCouponPasswordStatus.USED.getCode());
-            couponPassword.setStatus(EnumCouponPasswordStatus.USED.getCode());
-            couponPasswordService.saveOrUpdate(updateCouponPwd);
-        } catch (Exception e) {
-            logger.error(e.getMessage());
-            return new ResultData(ErrorCode.DB_FAIL);
-        }
+        // 卡密领取卡券
+        Integer pwdStatus = couponPassword.getStatus();
+        setCouponPasswordStatus(couponPassword, EnumCouponPasswordStatus.USED);
+        couponPassword.setStatus(EnumCouponPasswordStatus.USED.getCode());
 
         // 3. 领取free coupon
         try {
             WxOrder order = orderService.saveFreeOrderForCoupon(cuUser, coupon, null, formId, couponPassword.getId());
         } catch (MallinkException e) {
+            setCouponPasswordStatus(couponPassword, EnumCouponPasswordStatus.getEnum(pwdStatus));
             logger.error(e.getMessage());
             return new ResultData(e.getErrorCode(), e.getMessage());
         } catch (Exception e) {
+            setCouponPasswordStatus(couponPassword, EnumCouponPasswordStatus.getEnum(pwdStatus));
             logger.error(e.getMessage());
             return new ResultData(500, e.getMessage());
         }
         return new ResultData();
     }
+
+    private void setCouponPasswordStatus(WxCouponPassword couponPassword, EnumCouponPasswordStatus pwdStatus) {
+        WxCouponPassword updateCouponPwd = new WxCouponPassword();
+        updateCouponPwd.setId(couponPassword.getId());
+        updateCouponPwd.setStatus(pwdStatus.getCode());
+        couponPasswordService.saveOrUpdate(updateCouponPwd);
+    }
+
 }

mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java

@@ -1,8 +1,14 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.ResultData;
+import com.iformall.domain.po.WxCUser;
+import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxCouponPassword;
+import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.vo.WxCouponPasswordCountInfoVO;
+import com.iformall.enums.EnumCouponPasswordStatus;
+import com.iformall.exception.MallinkException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -35,8 +41,8 @@ public interface WxCouponPasswordService {
      * @return
      */
     WxCouponPassword getByObj(WxCouponPassword obj);
-    
-        /**
+
+    /**
      * 保存或更新实体
      *
      * @param record

mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java

@@ -34,7 +34,6 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {
     @Autowired
     ExcelService excelService;
 
-
     @Override
     public PageInfo<WxCouponPassword> listAsPage(WxCouponPassword record, Integer pageIndex, Integer pageSize) {
         return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponPasswordMapper.findList(record));