|
|
|
@@ -19,6 +19,8 @@ import com.iformall.domain.po.WxCoupon; |
|
|
|
import com.iformall.domain.po.WxEnergyFees; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxPayAccountBill; |
|
|
|
import com.iformall.domain.po.WxShop; |
|
|
|
import com.iformall.domain.po.WxShopUsers; |
|
|
|
import com.iformall.domain.po.WxUserDataRule; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.vo.WxBillBad; |
|
|
|
@@ -32,6 +34,7 @@ import com.iformall.enums.EnumBillOweOrNearType; |
|
|
|
import com.iformall.enums.EnumBillStatus; |
|
|
|
import com.iformall.enums.EnumCouponType; |
|
|
|
import com.iformall.enums.EnumRentContractManageFeeType; |
|
|
|
import com.iformall.enums.EnumShopUsersStatus; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.service.ExcelService; |
|
|
|
import com.iformall.service.SysConfigService; |
|
|
|
@@ -684,11 +687,45 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
be.setMerchantName(m.getName()); |
|
|
|
be.setRentName(getBillRentName(be,m)); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(list); |
|
|
|
} |
|
|
|
|
|
|
|
private String getBillRentName(WxAllBill be,WxMerchant m) { |
|
|
|
if (StringUtils.isNotBlank(be.getCusName())) { |
|
|
|
return be.getCusName(); |
|
|
|
}else { |
|
|
|
//如果不是虚拟商户,则取商户的名称 |
|
|
|
if (m.getIsPrivate() == EnumYesOrNo.NO.getCode()) { |
|
|
|
return m.getName(); |
|
|
|
}else { |
|
|
|
if (StringUtils.isBlank(m.getCreateShopNumber())) { |
|
|
|
return m.getName(); |
|
|
|
} |
|
|
|
WxShop shop = wxShopSerivce.getShopByShopNumber(m, m.getCreateShopNumber()) ; |
|
|
|
if (null != shop ) { |
|
|
|
//查询租户和业主 |
|
|
|
WxShopUsers suq = new WxShopUsers(); |
|
|
|
suq.updateTenantInfo(be); |
|
|
|
suq.setShopId(shop.getId()); |
|
|
|
suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); |
|
|
|
suq.setSortColumns("type desc"); |
|
|
|
WxShopUsers wsu = wxShopSerivce.getOneShopUsers(suq); |
|
|
|
if (null != wsu) { |
|
|
|
return wsu.getName(); |
|
|
|
}else { |
|
|
|
return m.getName(); |
|
|
|
} |
|
|
|
}else { |
|
|
|
return m.getName(); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//待支付给商户的账单 |
|
|
|
@GetMapping("toPaymerchantBills") |
|
|
|
public ResultData toPaymerchantBills(@ModelAttribute WxMerchant wxMerchant) { |
|
|
|
@@ -738,6 +775,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
be.setMerchantName(m.getName()); |
|
|
|
be.setRentName(getBillRentName(be,m)); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(list); |
|
|
|
|