Explorar el Código

fix

release_toaliyun_real
winter hace 1 año
padre
commit
96e9e83115
Se han modificado 2 ficheros con 5 adiciones y 3 borrados
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Ver fichero

@@ -265,12 +265,12 @@ public class WxAllBillController extends BillBaseController {
@ApiOperation("预览结算单") @ApiOperation("预览结算单")
@PostMapping("viewSettleTemplate") @PostMapping("viewSettleTemplate")
@TenantIgnore @TenantIgnore
public ResultData viewSettleTemplate(@RequestBody WxMerchant merchant,Long templateId) {
if (null == merchant.getId() || null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) {
public ResultData viewSettleTemplate(@RequestBody WxMerchant merchant) {
if (null == merchant.getId() || null == merchant.getTemplateId() ||null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) {
return new ResultData(Result.ERROR,"清选择商户和科目"); return new ResultData(Result.ERROR,"清选择商户和科目");
} }
WxMerchantBillVo vo = getMerchantBillVo(merchant); WxMerchantBillVo vo = getMerchantBillVo(merchant);
return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),templateId,merchant.getFeesIdList(),vo));
return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),merchant.getTemplateId(),merchant.getFeesIdList(),vo));
} }
/** /**


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Ver fichero

@@ -488,5 +488,7 @@ public class WxMerchant extends TenantEntity {
public Integer isPreview; public Integer isPreview;
@TableField(exist = false) @TableField(exist = false)
public List<Long> feesIdList; public List<Long> feesIdList;
@TableField(exist = false)
public Long templateId;
} }

Cargando…
Cancelar
Guardar