ソースを参照

Merge branch 'release_toaliyun_real' of http://221.219.212.246:13000/server/formallProject into release_toaliyun_real

release_toaliyun_real
xhxu 5年前
コミット
c82cd5c30e
2個のファイルの変更8行の追加2行の削除
  1. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
  2. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java ファイルの表示

@@ -2,11 +2,13 @@ package com.iformall.service.impl;


import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxBillSettleVo; import com.iformall.domain.vo.WxBillSettleVo;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.ExcelService; import com.iformall.service.ExcelService;
import com.iformall.service.WxBillSettleService; import com.iformall.service.WxBillSettleService;
@@ -103,6 +105,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {


if(billSettle != null) { if(billSettle != null) {
WxMerchant merchant = wxMerchantMapper.selectById(billSettle.getMerchantId()); WxMerchant merchant = wxMerchantMapper.selectById(billSettle.getMerchantId());
if (null == merchant) {
throw new MallinkException(ErrorCode.MALL_INFO_NOT_FOUND);
}
if(merchant != null){ if(merchant != null){
billSettle.setMerchantName(merchant.getName()); billSettle.setMerchantName(merchant.getName());
} }


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java ファイルの表示

@@ -10,7 +10,8 @@ import com.iformall.enums.EnumMsgSendStatus;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.WxMsgCallbackService; import com.iformall.service.WxMsgCallbackService;
import com.iformall.utils.HMACSHA256; import com.iformall.utils.HMACSHA256;
import jodd.util.StringUtil;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -191,7 +192,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService {
wxMsgCallback.setBatchNo(param.get("biz_id")); wxMsgCallback.setBatchNo(param.get("biz_id"));
if("true".equals(success)){ if("true".equals(success)){
wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode()); wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode());
if(StringUtil.isNotBlank(param.get("out_id"))){
if(StringUtils.isNotBlank(param.get("out_id"))){
WxCouponPassword couponPassword = new WxCouponPassword(); WxCouponPassword couponPassword = new WxCouponPassword();
couponPassword.setId(Long.valueOf(param.get("out_id"))); couponPassword.setId(Long.valueOf(param.get("out_id")));
couponPassword.setStatus(EnumCouponPasswordStatus.MSG_SENDED.getCode()); couponPassword.setStatus(EnumCouponPasswordStatus.MSG_SENDED.getCode());


読み込み中…
キャンセル
保存