From 86f5778a3fdf7e356db72d3197ae4854884331ef Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 17 Jun 2021 11:28:38 +0800 Subject: [PATCH 1/4] tt --- .../iformall/service/WxMerchantService.java | 4 ++ .../service/impl/WxMerchantServiceImpl.java | 52 +++++++++++++++++++ .../service/tt/impl/TtCouponServiceImpl.java | 1 + .../basic/WxMerchantController.java | 18 +++++++ .../controller/tt/TtCouponController.java | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) 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{ From 5650b68b8e396c6a6c29eade6f5086ee7735c2d2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 17 Jun 2021 12:49:27 +0800 Subject: [PATCH 2/4] tt --- .../java/com/iformall/service/tt/impl/TtOrderServiceImpl.java | 2 +- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java index 6d56eea11..690b09f05 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java @@ -411,7 +411,7 @@ public class TtOrderServiceImpl implements TtOrderService { WxMerchant merchant = new WxMerchant(); merchant.setId(order.getMerchantId()); merchant.setEntryAmount(order.getPayment()); - merchant.setCashOutNumber(order.getPayment()); +// merchant.setCashOutNumber(order.getPayment()); int i = wxMerchantMapper.recordedAmount(merchant); if(i == 1){ ttOrderMapper.updateIsRecorded(order.getId(),EnumYesOrNo.YES.getCode()); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 3f26f17c0..f1e300a9d 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -702,8 +702,8 @@ update wx_merchant set - entry_amount = ifnull(entry_amount,0)+#{entryAmount}, - cash_out_number = ifnull(cash_out_number,0)+#{cashOutNumber} + entry_amount = ifnull(entry_amount,0)+#{entryAmount} + /*,cash_out_number = ifnull(cash_out_number,0)+#{cashOutNumber}*/ where id = #{id} From c5f0cabab70527f6bbdb3cd3c6427fc247067e72 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 17 Jun 2021 13:36:47 +0800 Subject: [PATCH 3/4] tt --- .../main/java/com/iformall/utils/AppTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index 832dad7ee..bfccccab1 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -49,24 +49,24 @@ public class AppTest { */ IdWorker idWorker = IdWorker.get(); -// paramMap.put("sourceType", EnumUserType.THIRD_CIRCLE.getCode().toString()); + paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString()); paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 - paramMap.put("shopName","百丽");//门店名称 - paramMap.put("userNumber","441388943427399680");//***会员Id +// paramMap.put("shopName","百丽");//门店名称 + paramMap.put("userNumber","564603843541262336");//***会员Id // paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2021-06-15 16:13:11");//***付款时间(yyyy-MM-dd HH:mm:ss) - paramMap.put("amount","9100");//***付款金额(分) + paramMap.put("timeEnd","2021-06-16 15:28:00");//***付款时间(yyyy-MM-dd HH:mm:ss) + paramMap.put("amount","1000");//***付款金额(分) // paramMap.put("summary","");//付款摘要 /** * 交易退款信息 参数 */ // IdWorker idWorker = IdWorker.get(); -//// paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString()); -// paramMap.put("transactionId","564279392066437120");//***订单Id -// paramMap.put("refundTime","2021-06-14 00:58:00");//***退款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString()); +// paramMap.put("transactionId","565041847967240192");//***订单Id +// paramMap.put("refundTime","2021-06-16 15:21:21");//***退款时间(yyyy-MM-dd HH:mm:ss) //// paramMap.put("refundAmount","1000");//退款金额(分) // paramMap.put("refundSummary","我要退款1");//付款摘要 // paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号 From 601b3fc35cf9dbefc0d3e6eea77708ccccc5ef8e Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 17 Jun 2021 15:14:14 +0800 Subject: [PATCH 4/4] tt --- .../java/com/iformall/schedule/TtOrderExpiringSchedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java b/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java index eaac8adff..f966c34ff 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java @@ -49,7 +49,7 @@ public class TtOrderExpiringSchedule { Map wxPayAccountMap = new HashMap<>(); WxAppinfo appQ = new WxAppinfo(); appQ.setType(EnumAppType.C.getCode()); - appQ.setPlat(EnumPayWay.PAY_WAY_TT.getCode()); + appQ.setPlat(EnumPayWay.PAY_WAY_TT.getPlat().getCode()); List wxAppinfoList = wxAppinfoService.getList(appQ); for (WxAppinfo wxAppinfo:wxAppinfoList) { wxAppinfoMap.put(wxAppinfo.getFinalTenantId(),wxAppinfo);//一个集团一个小程序