This commit is contained in:
linfso 2024-09-02 16:10:16 +08:00
parent 8813f00320
commit 0d88cbc4bd

View File

@ -37,6 +37,7 @@ import com.xdadan.erp.emis.domain.EmisSettleSubBillFeeitem;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.service.IEmisSettleBillPayLogService;
import com.xdadan.erp.emis.service.billexport.ExcelUtils;
import com.xdadan.erp.emis.service.billexport.MapObjectUtil;
import com.xdadan.erp.emis.utils.WaybillHelper;
@ -79,6 +80,10 @@ public class EmisSettleBillController extends BaseController
@Autowired
private IEmisSettleBillService emisSettleBillService;
@Autowired
private IEmisSettleBillPayLogService emisSettleBillPayLogService;
@Autowired
private EmisBaseService emisBaseService;
@ -161,14 +166,51 @@ public class EmisSettleBillController extends BaseController
/**
* 获取结算总账单详细信息
*/
// @PreAuthorize("@ss.hasPermi('emis:emisSettleBill:query')")
@GetMapping(value = "/getInfoBySettleBillNo")
public AjaxResult getInfoBySettleBillNo(String settleBillNo)
{
return AjaxResult.success(emisBaseService.getSettleBillBySettleBillNo(settleBillNo));
EmisSettleBill emisSettleBill=emisBaseService.getSettleBillBySettleBillNo(settleBillNo);
BigDecimal thisPayMoney=emisSettleBill.getRecMoney().subtract(emisSettleBill.getRecedMoney());
emisSettleBill.setThisPayMoney(thisPayMoney);
// subBillList , 返回子账单列表
List<EmisSettleSubBill> subBillList=emisBaseService.selectSubBillListBySettleBillNo(settleBillNo);
emisSettleBill.setSubBillList(subBillList);
return AjaxResult.success("成功",emisSettleBill);
}
/**
* 获取微信二维码付款图片
* @param emisSettleBill
* @return
*/
@GetMapping(value = "/getWxPayQrCode")
public AjaxResult getWxPayQrCode(EmisSettleBill emisSettleBill)
{
try {
String qrPicUrl=emisSettleBillPayLogService.genWxPayQR(emisSettleBill.getSettleBillNo());
return AjaxResult.success("成功",qrPicUrl);
} catch (EmisBizError emisBizError) {
emisBizError.printStackTrace();
return AjaxResult.error(emisBizError.getMessage());
}
}
@PostMapping(value = "/sumbitWxPay")
public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill)
{
String customerCode=emisSettleBill.getCustomerCode();
emisSettleBill.setCustomerCode(customerCode);
return AjaxResult.success("123");
}
/**
* 新增结算总账单
*/
@ -618,6 +660,10 @@ public class EmisSettleBillController extends BaseController
return toAjax(emisSettleBillService.updateEmisSettleBill(emisSettleBill));
}
/**
* 删除结算总账单
*/