winter 1 год назад
Родитель
Сommit
9ddfe2a335
3 измененных файлов: 21 добавлений и 15 удалений
  1. +5
    -14
      mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
  3. +12
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java

+ 5
- 14
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("账单操作记录列表")


+ 4
- 0
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;
}

+ 12
- 1
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


Загрузка…
Отмена
Сохранить