Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
This commit is contained in:
commit
2949a3a511
@ -40,8 +40,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.xdadan.erp.emis.mapper.EmisSettleBillPayLogMapper;
|
||||
import com.xdadan.erp.emis.service.IEmisSettleBillPayLogService;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
/**
|
||||
/**
|
||||
* 支付订单表Service业务层处理
|
||||
*
|
||||
* @author linfso
|
||||
@ -308,6 +309,7 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer
|
||||
* @param payId
|
||||
* @return
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int checkPayStatus(String payId) throws EmisBizError {
|
||||
|
||||
@ -346,7 +348,12 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer
|
||||
salesmen=oldSettleBill.getSalesmen();
|
||||
}
|
||||
|
||||
|
||||
// 更新状态
|
||||
emisSettleBillPayLog.setPaid(1);
|
||||
emisSettleBillPayLog.setStatus(20);
|
||||
emisSettleBillPayLog.setStatusDesc(errMsg);
|
||||
emisSettleBillPayLog.setPaySuccTime(new Date());
|
||||
emisSettleBillPayLogMapper.updateEmisSettleBillPayLog(emisSettleBillPayLog);
|
||||
|
||||
// 获取支付账单,转为为真实支付单
|
||||
EmisSettlePayRecord emisSettlePayRecord=new EmisSettlePayRecord();
|
||||
@ -392,12 +399,7 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer
|
||||
|
||||
emisSettlePayRecordService.insertEmisSettlePayRecord(emisSettlePayRecord,emisSettleBillPayLog.getPayId());
|
||||
|
||||
// 更新状态
|
||||
emisSettleBillPayLog.setPaid(1);
|
||||
emisSettleBillPayLog.setStatus(20);
|
||||
emisSettleBillPayLog.setStatusDesc(errMsg);
|
||||
emisSettleBillPayLog.setPaySuccTime(new Date());
|
||||
emisSettleBillPayLogMapper.updateEmisSettleBillPayLog(emisSettleBillPayLog);
|
||||
|
||||
|
||||
try {
|
||||
// 通知销售联系人
|
||||
|
||||
Loading…
Reference in New Issue
Block a user