'导入、生成卡券销售码不受状态限制'

dev-discount
199901012 4 years ago
parent eae0a3a306
commit e831642b42
  1. 10
      hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java
  2. 2
      hai-cweb/src/main/java/com/cweb/controller/HighCouponController.java

@ -391,8 +391,6 @@ public class HighCouponController {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
return ResponseMsgUtil.success(new PageInfo<>(highCouponService.getCouponList(map))); return ResponseMsgUtil.success(new PageInfo<>(highCouponService.getCouponList(map)));
} catch (Exception e) { } catch (Exception e) {
log.error("HighCouponController -> getCouponList() error!",e); log.error("HighCouponController -> getCouponList() error!",e);
@ -421,10 +419,6 @@ public class HighCouponController {
log.error("HighCouponController -> writeStock() error!","卡卷类型错误"); log.error("HighCouponController -> writeStock() error!","卡卷类型错误");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_TYPE_ERROR, ""); throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_TYPE_ERROR, "");
} }
if (coupon.getStatus() != 1 && coupon.getStatus() != 3) {
log.error("HighCouponController -> writeStock() error!","卡卷状态错误");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_STATUS_ERROR, "");
}
ImportCouponListener importCouponListener = new ImportCouponListener(); ImportCouponListener importCouponListener = new ImportCouponListener();
importCouponListener.initData(coupon,userInfoModel, highCouponCodeService); importCouponListener.initData(coupon,userInfoModel, highCouponCodeService);
@ -470,10 +464,6 @@ public class HighCouponController {
log.error("HighCouponController -> writeStock() error!","卡卷类型错误"); log.error("HighCouponController -> writeStock() error!","卡卷类型错误");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_TYPE_ERROR, ""); throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_TYPE_ERROR, "");
} }
if (coupon.getStatus() != 1) {
log.error("HighCouponController -> writeStock() error!","卡卷状态错误");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_STATUS_ERROR, "");
}
// 销售截止时间 // 销售截止时间
Calendar salesEndTimeC = Calendar.getInstance(); Calendar salesEndTimeC = Calendar.getInstance();

@ -212,10 +212,8 @@ public class HighCouponController {
HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject();
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("merchantId", highMerchantStoreService.getMerchantStoreById(storeId).getMerchantId()); map.put("merchantId", highMerchantStoreService.getMerchantStoreById(storeId).getMerchantId());
map.put("userId", userInfoModel.getHighUser().getId()); map.put("userId", userInfoModel.getHighUser().getId());
map.put("status", 1); map.put("status", 1);
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);

Loading…
Cancel
Save