Browse Source

Merge branch 'release_toaliyun_real_20230315' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230315

release_toaliyun_real
xhxu 3 years ago
parent
commit
6b90e0b312
3 changed files with 4 additions and 1 deletions
  1. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml

+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java View File

@@ -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<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java View File

@@ -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"))){


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml View File

@@ -109,7 +109,7 @@
</select>

<update id="updateByBatchNo" parameterType="com.iformall.domain.po.WxMsgCallback">
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}
</update>
</mapper>

Loading…
Cancel
Save