This commit is contained in:
linfso 2025-06-25 03:35:22 +08:00
parent b6504b3e97
commit f250643089

View File

@ -103,9 +103,6 @@ public class SettleBillController extends BaseController
return getDataTable(list);
}
/**
* 获取结算总账单详细信息
*/
@ -132,13 +129,50 @@ public class SettleBillController extends BaseController
List<EmisSettleSubBill> subBillList=emisBaseService.selectSubBillListBySettleBillNo(settleBillNo);
emisSettleBill.setSubBillList(subBillList);
try {
int isCanPay=emisSettleBillService.checkCanOnlinePay(emisSettleBill);
if(isCanPay==1) {
emisSettleBill.setBlLockOnlinePay("F");
}else{
emisSettleBill.setBlLockOnlinePay("T");
emisSettleBill.setLockOnlinePayReason("该单不支持在线支付");
}
} catch (EmisBizError emisBizError) {
emisBizError.printStackTrace();
emisSettleBill.setBlLockOnlinePay("T");
emisSettleBill.setLockOnlinePayReason("该单不支持在线支付:"+emisBizError.getMessage());
}
return AjaxResult.success("成功",emisSettleBill);
}
@GetMapping(value = "/checkCanOnlinePay")
public AjaxResult checkCanOnlinePay(EmisSettleBill emisSettleBill)
{
try {
int isCanPay=emisSettleBillService.checkCanOnlinePay(emisSettleBill);
if(isCanPay==1) {
return AjaxResult.success("支持在线支付", isCanPay);
}else{
return AjaxResult.error("不支持在线支付", isCanPay);
}
} catch (EmisBizError emisBizError) {
emisBizError.printStackTrace();
return AjaxResult.error(emisBizError.getMessage());
}
}
@GetMapping(value = "/getWxPayQrCode")
public AjaxResult getWxPayQrCode(EmisSettleBill emisSettleBill)
{
try {
int isCanPay=emisSettleBillService.checkCanOnlinePay(emisSettleBill);
if(isCanPay==1) {
return AjaxResult.success("支持在线支付", isCanPay);
}else{
return AjaxResult.error("不支持在线支付", isCanPay);
}
String qrPicUrl=emisSettleBillPayLogService.genWxPayQR(emisSettleBill.getSettleBillNo());
return AjaxResult.success("成功",qrPicUrl);
} catch (EmisBizError emisBizError) {
@ -153,6 +187,15 @@ public class SettleBillController extends BaseController
// String customerCode=emisSettleBill.getCustomerCode();
// emisSettleBill.setCustomerCode(customerCode);
try {
int isCanPay=emisSettleBillService.checkCanOnlinePay(emisSettleBill);
if(isCanPay==1) {
return AjaxResult.success("支持在线支付", isCanPay);
}else{
return AjaxResult.error("不支持在线支付", isCanPay);
}
Map<String,String> payObj=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getAppId(),emisSettleBill.getOpenId());
return AjaxResult.success("成功",payObj);
} catch (EmisBizError emisBizError) {