xhxu 5 лет назад
Родитель
Сommit
b8715584ed
2 измененных файлов: 15 добавлений и 4 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java
  2. +13
    -3
      mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java Просмотреть файл

@@ -138,7 +138,8 @@ public class TtCouponServiceImpl implements TtCouponService {
if(byId == null){ if(byId == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"未找到课程"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"未找到课程");
} }
if(!byId.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_BEFOR_SHELF.getCode())){
if(!byId.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_BEFOR_SHELF.getCode())
&& !byId.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_AFTER_SHELF.getCode())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"此课程状态不允许上架或者已上架"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"此课程状态不允许上架或者已上架");
} }
byId.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode()); byId.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode());


+ 13
- 3
mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java Просмотреть файл

@@ -83,6 +83,17 @@ public class TtCouponController extends BaseController {
TenantEntity tenantEntity = getTenantInfo(); TenantEntity tenantEntity = getTenantInfo();
record.updateTenantInfo(tenantEntity); record.updateTenantInfo(tenantEntity);


if(record.getId() != null){
TtCoupon coupon = ttCouponService.getById(record.getId());
if (null == coupon || EnumDelFlag.YES.getCode().equals(record.getIsDel())) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR,"找不到课程,或课程已删除");
}
if(!coupon.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_DRAFT.getCode())
&& !coupon.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_REJECT.getCode())){
return new ResultData(ErrorCode.SYS_SERVER_ERROR,"该课程状态不允许修改");
}
}

if(record.getMerchantId() == null){ if(record.getMerchantId() == null){
WxMerchant merchantQ = new WxMerchant(); WxMerchant merchantQ = new WxMerchant();
merchantQ.updateTenantInfo(tenantEntity); merchantQ.updateTenantInfo(tenantEntity);
@@ -174,9 +185,7 @@ public class TtCouponController extends BaseController {
} }
TenantEntity tenantEntity = getTenantInfo(); TenantEntity tenantEntity = getTenantInfo();
record.updateTenantInfo(tenantEntity); record.updateTenantInfo(tenantEntity);
if(EnumDelFlag.YES.getCode().equals(record.getIsDel())){
return new ResultData(ErrorCode.SYS_SERVER_ERROR,"找不到课程,或课程已删除");
}

TtCoupon coupon = ttCouponService.getById(record.getId()); TtCoupon coupon = ttCouponService.getById(record.getId());
if (null == coupon || EnumDelFlag.YES.getCode().equals(record.getIsDel())) { if (null == coupon || EnumDelFlag.YES.getCode().equals(record.getIsDel())) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR,"找不到课程,或课程已删除"); return new ResultData(ErrorCode.SYS_SERVER_ERROR,"找不到课程,或课程已删除");
@@ -191,6 +200,7 @@ public class TtCouponController extends BaseController {
record.setMerchantId(list.get(0).getId()); record.setMerchantId(list.get(0).getId());
} }
} }

if(record.getMerchantId() == null){ if(record.getMerchantId() == null){
return new ResultData(ErrorCode.SYS_SERVER_ERROR,"找不到作者"); return new ResultData(ErrorCode.SYS_SERVER_ERROR,"找不到作者");
} }


Загрузка…
Отмена
Сохранить