This commit is contained in:
linfso 2025-06-19 19:32:18 +08:00
parent 30303f1e09
commit 0c90598e61
3 changed files with 17 additions and 9 deletions

View File

@ -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.enums.BusinessType;
import com.xdadan.erp.oms.common.utils.DateUtils; import com.xdadan.erp.oms.common.utils.DateUtils;
import com.xdadan.erp.oms.common.utils.SecurityUtils; 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.EmisSmsSendRecord;
import com.xdadan.erp.oms.domain.exception.EmisBizError; import com.xdadan.erp.oms.domain.exception.EmisBizError;
import com.xdadan.erp.oms.domain.vo.AddressParseResult; import com.xdadan.erp.oms.domain.vo.AddressParseResult;
@ -391,12 +392,14 @@ public class Oms2cCommonController extends BaseController
@GetMapping(value = "/getBillPayInfo") @GetMapping(value = "/getBillPayInfo")
public AjaxResult getBillPayInfo(String settleBillNo) public AjaxResult getBillPayInfo(String settleBillNo)
{ {
SysOmsUser sysOmsUser= SecurityUtils.getLoginUser().getUser(); // SysOmsUser sysOmsUser= SecurityUtils.getLoginUser().getUser();
return iRpcSettleBillSvc.getInfoBySettleBillNo(settleBillNo);
return iRpcSettleBillSvc.getBillPayInfo(settleBillNo);
} }
@PostMapping(value = "/sumbitWxPay")
public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill){
return iRpcSettleBillSvc.sumbitWxPay(emisSettleBill);
}
} }

View File

@ -89,19 +89,23 @@ public class Oms2cSettleBillController extends BaseController
return iRpcSettleBillSvc.listSimple(sysOmsUser.getCustomerCode(),params, pageNum,pageSize); return iRpcSettleBillSvc.listSimple(sysOmsUser.getCustomerCode(),params, pageNum,pageSize);
} }
/** /**
* 获取结算总账单详细信息 * 获取结算总账单详细信息
*/ */
@GetMapping(value = "/getInfoBySettleBillNo") @GetMapping(value = "/getInfoBySettleBillNo")
public AjaxResult getInfoBySettleBillNo(String settleBillNo) 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);
}
} }

View File

@ -40,12 +40,13 @@ public interface IRpcSettleBillSvc {
@RequestParam("pageSize") Integer pageSize); @RequestParam("pageSize") Integer pageSize);
@GetMapping("/apiweb/emisSettleBill/getInfoBySettleBillNo") @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") @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") @PostMapping("/apiweb/emisSettleBill/sumbitWxPay")
public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill); public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill);