diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 96b9f3cbe..1988a4f0c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -172,4 +172,8 @@ public interface WxMerchantService { ResultData addttMerchant(WxMerchant wxMerchant, Long userId); + + ResultData ttdisable(Long id); + + ResultData ttstartusing(Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 494c228d2..17e0af30d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.tt.TtCoupon; import com.iformall.domain.po.tt.TtUserFollow; import com.iformall.domain.vo.*; import com.iformall.enums.*; @@ -105,6 +106,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxMallService wxMallService; + @Autowired + TtCouponMapper ttCouponMapper; + @Autowired TtUserFollowMapper ttUserFollowMapper; @@ -1088,4 +1092,52 @@ public class WxMerchantServiceImpl implements WxMerchantService { } } + @Override + @Transactional(rollbackFor = {Exception.class}) + public ResultData ttdisable(Long id) { + WxMerchant wxMerchant = wxMerchantMapper.selectById(id); + if (wxMerchant == null || wxMerchant.getStatus().equals(EnumYesOrNo.NO.getCode())) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"作者信息未找到或者已停用"); + } + //停用作者 + WxMerchant disableMerchant = new WxMerchant(); + disableMerchant.setId(id); + disableMerchant.setStatus(EnumYesOrNo.NO.getCode()); + disableMerchant.setMark(EnumYesOrNo.NO.getCode()); + disableMerchant.setUpdateDate(new Date()); + wxMerchantMapper.updateById(disableMerchant); + //下架作者所有作品 + TtCoupon couponq = new TtCoupon(); + couponq.setMerchantId(id); + couponq.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode()); + TtCoupon coupon = new TtCoupon(); + coupon.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_AFTER_SHELF.getCode()); + coupon.setMark(EnumYesOrNo.NO.getCode()); + coupon.setUpdateDate(new Date()); + ttCouponMapper.update(coupon,new QueryWrapper<>(couponq)); + //驳回作者下所有审核中的作品 + couponq.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_EXAMINE.getCode()); + coupon.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_REJECT.getCode()); + coupon.setRemark("作者停用"); + ttCouponMapper.update(coupon,new QueryWrapper<>(couponq)); + //关闭所有待支付订单(暂未处理) + + return new ResultData(); + } + + @Override + public ResultData ttstartusing(Long id) { + WxMerchant wxMerchant = wxMerchantMapper.selectById(id); + if (wxMerchant == null || wxMerchant.getStatus().equals(EnumYesOrNo.NO.getCode())) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"作者信息未找到或者已启用"); + } + WxMerchant disableMerchant = new WxMerchant(); + disableMerchant.setId(id); + disableMerchant.setStatus(EnumYesOrNo.YES.getCode()); + disableMerchant.setUpdateDate(new Date()); + wxMerchantMapper.updateById(disableMerchant); + + return new ResultData(); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java index b632e0c43..eaa507b3d 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java @@ -190,6 +190,7 @@ public class TtCouponServiceImpl implements TtCouponService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"此课程状态不允许下架或者已下架"); } byId.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_AFTER_SHELF.getCode()); + byId.setMark(EnumYesOrNo.NO.getCode()); byId.setUpdateDate(new Date()); ttCouponMapper.updateById(byId); return new ResultData(); diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 47a730073..d3d03eb3d 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -382,6 +382,24 @@ public class WxMerchantController extends BaseController { return resultData; } + @ApiOperation("停用作者") + @GetMapping("ttdisable") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "商户-停用") + public ResultData ttdisable(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::ttdisable"); + return wxMerchantService.ttdisable(id); + } + + @ApiOperation("启用作者") + @GetMapping("ttstartusing") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "商户-停用") + public ResultData ttstartusing(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::ttstartusing"); + return wxMerchantService.ttstartusing(id); + } + @ApiOperation("根据id查询接口") @GetMapping("/findttById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java index c45459c8b..0150649bf 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java @@ -136,7 +136,7 @@ public class TtCouponController extends BaseController { return new ResultData(ErrorCode.SYS_SERVER_ERROR,"数据异常,未找到课程视频"); } }else{ - return new ResultData(ErrorCode.SYS_SERVER_ERROR,"数据异常"); + return new ResultData(ErrorCode.SYS_SERVER_ERROR,"数据异常{type}"); } } }else{