diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java index eadfa99..34c2eb1 100644 --- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java @@ -168,13 +168,11 @@ public class SettleBillController extends BaseController try { int isCanPay=emisSettleBillService.checkCanOnlinePay(emisSettleBill); if(isCanPay==1) { - return AjaxResult.success("支持在线支付", isCanPay); + String qrPicUrl=emisSettleBillPayLogService.genWxPayQR(emisSettleBill.getSettleBillNo()); + return AjaxResult.success("成功",qrPicUrl); }else{ return AjaxResult.error("不支持在线支付", isCanPay); } - - String qrPicUrl=emisSettleBillPayLogService.genWxPayQR(emisSettleBill.getSettleBillNo()); - return AjaxResult.success("成功",qrPicUrl); } catch (EmisBizError emisBizError) { emisBizError.printStackTrace(); return AjaxResult.error(emisBizError.getMessage()); @@ -190,14 +188,12 @@ public class SettleBillController extends BaseController int isCanPay=emisSettleBillService.checkCanOnlinePay(emisSettleBill); if(isCanPay==1) { - return AjaxResult.success("支持在线支付", isCanPay); + Map payObj=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getAppId(),emisSettleBill.getOpenId()); + return AjaxResult.success("成功",payObj); }else{ return AjaxResult.error("不支持在线支付", isCanPay); } - - Map payObj=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getAppId(),emisSettleBill.getOpenId()); - return AjaxResult.success("成功",payObj); } catch (EmisBizError emisBizError) { emisBizError.printStackTrace(); return AjaxResult.error(emisBizError.getMessage());