aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-06-20 03:41:36 +08:00
parent ee31ebefec
commit 4a1be66503
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -249,8 +249,8 @@ public class EmisSettleBillController extends BaseController
public AjaxResult genWxPayFromWxApp(EmisSettleBill emisSettleBill)
{
try {
String qrPicUrl=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getOpenId());
return AjaxResult.success("成功",qrPicUrl);
Map<String,String> payObj=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getAppId(),emisSettleBill.getOpenId());
return AjaxResult.success("成功",payObj);
} catch (EmisBizError emisBizError) {
emisBizError.printStackTrace();
return AjaxResult.error(emisBizError.getMessage());
@ -261,9 +261,17 @@ public class EmisSettleBillController extends BaseController
@PostMapping(value = "/sumbitWxPay")
public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill)
{
String customerCode=emisSettleBill.getCustomerCode();
emisSettleBill.setCustomerCode(customerCode);
return AjaxResult.success("123");
// String customerCode=emisSettleBill.getCustomerCode();
// emisSettleBill.setCustomerCode(customerCode);
// return AjaxResult.success("123");
try {
Map<String,String> payObj=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getAppId(),emisSettleBill.getOpenId());
return AjaxResult.success("成功",payObj);
} catch (EmisBizError emisBizError) {
emisBizError.printStackTrace();
return AjaxResult.error(emisBizError.getMessage());
}
}

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java
View File

@ -195,6 +195,8 @@ public class EmisSettleBill extends BaseEntity
private String qrCodePayPicUrl;
// 支付人openId
private String openId;
// appId
private String appId;
List<EmisSettleSubBill> subBillList;

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillPayLogService.java
View File

@ -10,6 +10,7 @@
package com.xdadan.erp.emis.service;
import java.util.List;
import java.util.Map;
import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.emis.domain.EmisSettleBillPayLog;
@ -94,7 +95,7 @@ public interface IEmisSettleBillPayLogService
* @return
* @throws EmisBizError
*/
public String genWxPayFromWxApp(String settleBillNo,String appId,String openId) throws EmisBizError;
public Map<String,String> genWxPayFromWxApp(String settleBillNo, String appId, String openId) throws EmisBizError;
/**

13
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java
View File

@ -12,11 +12,9 @@ package com.xdadan.erp.emis.service.impl;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import cn.hutool.crypto.SignUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.xdadan.erp.common.core.domain.AjaxResult;
@ -236,7 +234,7 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer
* @throws EmisBizError
*/
@Override
public String genWxPayFromWxApp(String settleBillNo,String appId,String openId) throws EmisBizError {
public Map<String, String> genWxPayFromWxApp(String settleBillNo,String appId,String openId) throws EmisBizError {
EmisSettleBill emisSettleBill=emisSettleBillMapper.selectSettleBillBySettleBillNo(settleBillNo);
@ -280,14 +278,11 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer
log.info("支付代码生成==>{}",JSONObject.toJSONString(res));
emisSettleBillPayLogUpd.setResponseExtra(JSON.toJSONString(res));
if(res.isSuccess()){
String prepayId=((Map)res.getData().get("credential")).get("prepay_id").toString();
emisSettleBillPayLogUpd.setCredential(JSON.toJSONString(res.getData().get("credential")));
emisSettleBillPayLogUpd.setStatus(10);
emisSettleBillPayLogUpd.setStatusDesc("支付中");
emisSettleBillPayLogMapper.updateEmisSettleBillPayLog(emisSettleBillPayLogUpd);
return prepayId;
return (Map)res.getData().get("credential");
}
else{
emisSettleBillPayLogUpd.setStatus(40);