From e4fbcd3b70bdfa728a6096e4943bcb05a0434a54 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 23 Feb 2023 18:21:08 +0800 Subject: [PATCH] fix card --- .../controller/market/WxCardInfoController.java | 13 +++++++++++++ .../market/WxCouponPasswordController.java | 16 +++------------- .../iformall/controller/WxCardPayController.java | 11 ++++++++++- .../iformall/controller/WxCardPayController.java | 4 ++++ .../com/iformall/domain/po/WxCouponPassword.java | 2 +- .../com/iformall/mapper/WxCardInfoMapper.java | 4 ++-- .../iformall/mapper/WxCouponPasswordMapper.java | 2 ++ .../com/iformall/service/WxCardInfoService.java | 2 ++ .../com/iformall/service/WxCardSpendService.java | 1 + .../service/impl/WxCardInfoServiceImpl.java | 5 +++++ .../impl/WxCouponPasswordServiceImpl.java | 2 +- .../main/resources/mapper/WxCardInfoMapper.xml | 15 ++++++++++++--- .../resources/mapper/WxCouponPasswordMapper.xml | 4 ++++ 13 files changed, 60 insertions(+), 21 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardInfoController.java index e4e391cc3..46f9b39df 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardInfoController.java @@ -238,5 +238,18 @@ public class WxCardInfoController extends BaseController { wxCardSpendService.exportData(wxCardSpendVo, request, response); } + + @ApiOperation("启用/停用") + @PostMapping("/startOrStop") + @SystemControllerLog(description = "启用/停用") + public ResultData startOrStop(@RequestBody WxCardInfo WxCardInfo) { + try { + wxCardInfoService.startOrStop(WxCardInfo); + } catch (Exception e) { + logger.error(e.getMessage()); + return new ResultData(ErrorCode.COUPON_PASSWORD_POSTPONE_ERR.getCode(),"更新失败"); + } + return new ResultData(); + } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java index 585ac8b11..1886954dd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java @@ -87,8 +87,7 @@ public class WxCouponPasswordController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData batchList(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { wxCouponPassword.updateTenantInfo(getTenantInfo()); - - wxCouponPassword.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); + wxCouponPassword.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxCouponPasswordService.listVoAsPage(wxCouponPassword, pageNum, pageSize); return new ResultData(page); } @@ -97,20 +96,11 @@ public class WxCouponPasswordController extends BaseController { @PostMapping("/startOrStop") @SystemControllerLog(description = "启用/停用") public ResultData startOrStop(@RequestBody WxCouponPassword wxCouponPassword) { - // - if (wxCouponPassword.getCouponId() == null) { - logger.error("couponId不能为空: "); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - WxCouponPassword couponPassword = new WxCouponPassword(); - couponPassword.updateTenantInfo(getTenantInfo()); - couponPassword.setCouponId(wxCouponPassword.getCouponId()); - couponPassword.setExpireDate(wxCouponPassword.getExpireDate()); try { - wxCouponPasswordService.postpone(couponPassword); + wxCouponPasswordService.startOrStop(wxCouponPassword); } catch (Exception e) { logger.error(e.getMessage()); - return new ResultData(ErrorCode.COUPON_PASSWORD_POSTPONE_ERR); + return new ResultData(ErrorCode.COUPON_PASSWORD_POSTPONE_ERR.getCode(),"更新失败"); } return new ResultData(); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index b6e4989c9..8655a295a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -6,11 +6,13 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCardSpendVo; +import com.iformall.enums.EnumCardInfoStatus; import com.iformall.enums.EnumCouponStatus; import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumMerchantSubsidySource; import com.iformall.enums.EnumPayWay; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCardInfoService; @@ -142,11 +144,15 @@ public class WxCardPayController extends BaseController { logger.error("卡不存在: " + cardIdStr); return new ResultData(ErrorCode.CARD_IS_NOT_FOUND); } - return saveCardPayOrder(cUserId,cardInfo,merchantBUser,totalFeeStr,EnumPayWay.PAY_WAY_WECHAT); } private ResultData saveCardPayOrder(Long cUserId,WxCardInfo cardInfo,WxMerchantBUser merchantBUser,String totalFeeStr,EnumPayWay payWay) { + + if (EnumCardInfoStatus.STOP.getCode().intValue() == cardInfo.getStatus().intValue()) { + return new ResultData(ErrorCode.CARD_IS_NOT_FOUND.getCode(),"卡已被禁用."); + } + String ipStr = getIpAddr(); if (Constant.defaultCUserId != cUserId) { WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUserId,merchantBUser.getFinalTenantId()); @@ -250,6 +256,9 @@ public class WxCardPayController extends BaseController { if (null == couponPassword) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "卡未查询到"); } + if (EnumYesOrNo.YES.getCode().intValue() == couponPassword.getIsStop().intValue()) { + return new ResultData(ErrorCode.CARD_IS_NOT_FOUND.getCode(),"卡已被禁用."); + } WxCoupon coupon = wxCouponService.getById(couponPassword.getCouponId(),couponPassword.getTenantId()); if (coupon == null) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 7ecbf1a61..13d2c869d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -32,6 +32,7 @@ import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxOrder; import com.iformall.domain.vo.WxCardSpendVo; +import com.iformall.enums.EnumCardInfoStatus; import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumMerchantSubsidySource; @@ -137,6 +138,9 @@ public class WxCardPayController extends BaseController { logger.error("卡不存在: " + cardIdStr); return new ResultData(ErrorCode.CARD_IS_NOT_FOUND); } + if (EnumCardInfoStatus.STOP.getCode().intValue() == cardInfo.getStatus().intValue()) { + return new ResultData(ErrorCode.CARD_IS_NOT_FOUND.getCode(),"卡已被禁用."); + } if(payment > cardInfo.getRemainingAmount()) { logger.error("卡余额不足: " + cardIdStr); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java index 8d859a168..f06aa9cdb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java @@ -24,7 +24,7 @@ public class WxCouponPassword extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="卡券短ID",name="couponShort") private String couponShort; @Excel(name = "兑换码", width = 20, orderNum = "2") - @io.swagger.annotations.ApiModelProperty(value="商户名称",name="password") + @io.swagger.annotations.ApiModelProperty(value="卡密",name="password") private String password; @TableField(exist = false) private String passwordLike; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java index 76bbfc27b..523f83787 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java @@ -8,12 +8,12 @@ import java.util.List; public interface WxCardInfoMapper extends CommonMapper { - //List findVoList(WxCardVo wxCardVo); - void updateTransferStatusByCouponId(Long couponId); List findList(WxCardInfo wxCardInfo); List findIdList(WxCardInfo wxCardInfo); + + void updateStatus(WxCardInfo wxCardInfo); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java index b3cb51b4b..7a5bb4ae6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java @@ -27,5 +27,7 @@ public interface WxCouponPasswordMapper extends CommonMapper + + @@ -19,14 +21,13 @@ - - + `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`c_user_id`,`owner_user_id`,`coupon_password_id`,`coupon_password`,`transaction_id`, `amount`,`sale_amount`,`remaining_amount`,`service_fee_amount`,`share_fee_amount`,`remaining_share_fee_amount`, - `rate_amount`,`create_date`,`update_date`,`support_transfer` + `rate_amount`,`create_date`,`update_date`,`support_transfer`,`status` @@ -91,6 +92,10 @@ and `create_date` <= #{enddate} + + and `status` = #{status} + + and coupon_password_id in @@ -139,4 +144,8 @@ + + update wx_card_info set status=#{status},update_date=now() where id=#{id} and tenant_id = #{tenantId} + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index 794474c83..fa6b58a54 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -209,5 +209,9 @@ update wx_coupon_password set expire_date = #{expiredTime} , update_date = now() where coupon_id = #{couponId} + + + update wx_coupon_password set is_stop = #{isStop} , update_date = now() where id = #{id} and tenant_id = #{tenantId} +