diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index e1d0ddf35..661eb7777 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -24,6 +24,7 @@ import com.iformall.enums.EnumFlowKey; import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.SysConfigService; +import com.iformall.service.WxAllBillService; import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillSettleService; import com.iformall.service.WxFlowService; @@ -79,6 +80,9 @@ public class WxBillController extends BaseController { @Autowired WxPayAccountBillService wxPayAccountBillService; + + @Autowired + WxAllBillService wxAllBillService; /** * 账单类型 @@ -192,24 +196,11 @@ public class WxBillController extends BaseController { @ApiOperation("账单详情") @GetMapping("detail") public ResultData detail(@ModelAttribute WxMerchant wxMerchant,Integer billTypeValue,Long billId) { - if (null == billTypeValue || null == billId) { - return new ResultData(Result.ERROR,"参数错误"); - } - EnumBillAllType btype; - if (billTypeValue.intValue() == Constant.bill_all_type_manage_fee) { - btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; - }else { - btype = EnumBillAllType.getEnum(billTypeValue); - if (null == btype) { - return new ResultData(Result.ERROR,"分类非法"); - } - } if (null == wxMerchant) { wxMerchant = new WxMerchant(); } - wxMerchant.setId(this.getLoginBUser().getMerchantId()); wxMerchant.updateTenantInfo(getTenantInfo()); - return new ResultData(billAllHelper.getBillDetail(btype, wxMerchant,billId)); + return new ResultData(wxAllBillService.getById(wxMerchant,billId)); } @ApiOperation("账单操作记录列表") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java index dfc929d58..e45fe9c68 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -390,4 +390,8 @@ public class WxAllBill extends TenantEntity { public Integer advanceHasMoney; @TableField(exist = false) private String energyFeesIdStr; + @TableField(exist = false) + private String merchantLinkPerson; + @TableField(exist = false) + private String merchantPhone; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java index dad00c91e..00d6e7168 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -194,6 +194,8 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill WxMerchant m = merchantMap.get(e.getMerchantId()); if (null != m) { e.setMerchantName(m.getName()); + e.setMerchantLinkPerson(m.getLinkPerson()); + e.setMerchantPhone(m.getLinkPhone()); } } if (null != feesMap) { @@ -221,7 +223,16 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill @Override public WxAllBill getById(TenantEntity tenantEntity,Long id) { - return wxAllBillMapper.selectById(id, tenantEntity.getTenantId()); + WxAllBill bill = wxAllBillMapper.selectById(id, tenantEntity.getTenantId()); + if (null != bill) { + WxMerchant merchant = wxMerchantService.selectById(bill.getMerchantId()); + if (null != merchant) { + bill.setMerchantName(merchant.getName()); + bill.setMerchantLinkPerson(merchant.getLinkPerson()); + bill.setMerchantPhone(merchant.getLinkPhone()); + } + } + return bill; } @Override