From 980b99f3f132f141b4f9e49e916b2f26390a309e Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Wed, 15 Mar 2023 17:02:45 +0800 Subject: [PATCH] fix msg --- .../main/java/com/iformall/controller/WxCardPayController.java | 2 ++ .../com/iformall/service/impl/WxMsgCallbackServiceImpl.java | 1 + .../src/main/resources/mapper/WxMsgCallbackMapper.xml | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 84198227e..05af7dee2 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -31,6 +31,7 @@ import com.iformall.domain.po.WxCouponMerchant; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxOrder; +import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.enums.EnumCardInfoStatus; import com.iformall.enums.EnumCreditLockedStatus; @@ -222,6 +223,7 @@ public class WxCardPayController extends BaseController { wxCardSpend.updateTenantInfo(getTenantInfo()); //还需要查询默认用户的,就根据 //wxCardSpend.setOwnerId(cUserId); + wxCardSpend.setSortColumns(SortField.CreateDate_DESC); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index c61f58693..41aabb792 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -202,6 +202,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { String success = param.get("success"); WxMsgCallback wxMsgCallback = new WxMsgCallback(); wxMsgCallback.setBatchNo(param.get("biz_id")); + wxMsgCallback.setPhone(param.get("phone_number")); if("true".equalsIgnoreCase(success)){ wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode()); if(StringUtils.isNotBlank(param.get("out_id"))){ diff --git a/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml index e4232e146..c50cf7ef4 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml @@ -109,7 +109,7 @@ - update wx_msg_callback set status=#{status},status_msg=#{statusMsg} where `batch_no` = #{batchNo} + update wx_msg_callback set status=#{status},status_msg=#{statusMsg} where `batch_no` = #{batchNo} and phone=#{phone}