diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java index 00a8962..34ccb65 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java @@ -25,6 +25,7 @@ import com.xdadan.erp.oms.common.core.redis.RedissonService; import com.xdadan.erp.oms.common.enums.BusinessType; import com.xdadan.erp.oms.common.utils.DateUtils; import com.xdadan.erp.oms.common.utils.SecurityUtils; +import com.xdadan.erp.oms.domain.EmisSettleBill; import com.xdadan.erp.oms.domain.EmisSmsSendRecord; import com.xdadan.erp.oms.domain.exception.EmisBizError; import com.xdadan.erp.oms.domain.vo.AddressParseResult; @@ -391,12 +392,14 @@ public class Oms2cCommonController extends BaseController @GetMapping(value = "/getBillPayInfo") public AjaxResult getBillPayInfo(String settleBillNo) { - SysOmsUser sysOmsUser= SecurityUtils.getLoginUser().getUser(); - - return iRpcSettleBillSvc.getBillPayInfo(settleBillNo); +// SysOmsUser sysOmsUser= SecurityUtils.getLoginUser().getUser(); + return iRpcSettleBillSvc.getInfoBySettleBillNo(settleBillNo); } - + @PostMapping(value = "/sumbitWxPay") + public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill){ + return iRpcSettleBillSvc.sumbitWxPay(emisSettleBill); + } } diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cSettleBillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cSettleBillController.java index 32c1524..6bd41e7 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cSettleBillController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cSettleBillController.java @@ -89,19 +89,23 @@ public class Oms2cSettleBillController extends BaseController return iRpcSettleBillSvc.listSimple(sysOmsUser.getCustomerCode(),params, pageNum,pageSize); } - /** * 获取结算总账单详细信息 */ @GetMapping(value = "/getInfoBySettleBillNo") public AjaxResult getInfoBySettleBillNo(String settleBillNo) { - SysOmsUser sysOmsUser=SecurityUtils.getLoginUser().getUser(); +// SysOmsUser sysOmsUser=SecurityUtils.getLoginUser().getUser(); +// sysOmsUser.getCustomerCode(), - return iRpcSettleBillSvc.getInfoBySettleBillNo(sysOmsUser.getCustomerCode(),settleBillNo); + return iRpcSettleBillSvc.getInfoBySettleBillNo(settleBillNo); } + @PostMapping(value = "/sumbitWxPay") + public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill){ + return iRpcSettleBillSvc.sumbitWxPay(emisSettleBill); + } } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java index 6144350..b7bbd2d 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java @@ -40,12 +40,13 @@ public interface IRpcSettleBillSvc { @RequestParam("pageSize") Integer pageSize); + @GetMapping("/apiweb/emisSettleBill/getInfoBySettleBillNo") - public AjaxResult getInfoBySettleBillNo(@RequestParam("customerCode") String customerCode, @RequestParam("settleBillNo") String settleBillNo); + public AjaxResult getInfoBySettleBillNo(@RequestParam("settleBillNo") String settleBillNo); @GetMapping("/apiweb/emisSettleBill/getWxPayQrCode") - public AjaxResult getWxPayQrCode(@RequestParam("customerCode") String customerCode, @RequestParam("settleBillNo") String settleBillNo); + public AjaxResult getWxPayQrCode(@RequestParam("settleBillNo") String settleBillNo); @PostMapping("/apiweb/emisSettleBill/sumbitWxPay") public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill);