Преглед изворни кода

fix bug

release_toaliyun_real
winter пре 3 година
родитељ
комит
efd2d924e0
4 измењених фајлова са 16 додато и 15 уклоњено
  1. +0
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java
  3. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  4. +5
    -13
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 0
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java Прегледај датотеку

@@ -77,8 +77,6 @@ public class WxBillController extends BaseController {
@PostMapping("listBill") @PostMapping("listBill")
public ResultData listBill(@RequestBody WxBillAll wxBillAll) { public ResultData listBill(@RequestBody WxBillAll wxBillAll) {
logger.info("listBill WxBillAll:"+JSON.toJSONString(wxBillAll));
if(StringUtils.isEmpty(wxBillAll.getTenantId())){ if(StringUtils.isEmpty(wxBillAll.getTenantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId不能为空");
} }


+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java Прегледај датотеку

@@ -33,6 +33,7 @@ public interface WxBillAllMapper {
Map<String,Object> queryPaidInfo(WxBillAll record); Map<String,Object> queryPaidInfo(WxBillAll record);


List<Map<String,Object>> listRentBillData(WxBillAll wxBillAll); List<Map<String,Object>> listRentBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listRentManageBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listRentDepositBillData(WxBillAll wxBillAll); List<Map<String,Object>> listRentDepositBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listPropertyBillData(WxBillAll wxBillAll); List<Map<String,Object>> listPropertyBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listPropertyDepositBillData(WxBillAll wxBillAll); List<Map<String,Object>> listPropertyDepositBillData(WxBillAll wxBillAll);


+ 10
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Прегледај датотеку

@@ -335,6 +335,16 @@ public class WxBillAllServiceImpl implements WxBillAllService {
} else if (wxBillAll.getBillTypeValue().equals(EnumBillQueryType.SETTLE.getCode())) { } else if (wxBillAll.getBillTypeValue().equals(EnumBillQueryType.SETTLE.getCode())) {
wxBillAll.setBillTypeValue(EnumBillQueryType.SETTLE.getCode()); wxBillAll.setBillTypeValue(EnumBillQueryType.SETTLE.getCode());
maps = wxBillAllMapper.listSettleBillData(wxBillAll); maps = wxBillAllMapper.listSettleBillData(wxBillAll);
} else if (wxBillAll.getBillTypeValue().equals(EnumBillQueryType.RENT_BUSSINESS_MANAGE.getCode())) {
wxBillAll.setBillTypeValue(EnumBillQueryType.RENT_BUSSINESS_MANAGE.getCode());
wxBillAll.setBillTypeName(EnumBillQueryType.RENT_BUSSINESS_MANAGE.getMessage());
wxBillAll.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode());
maps = wxBillAllMapper.listRentManageBillData(wxBillAll);
} else if (wxBillAll.getBillTypeValue().equals(EnumBillQueryType.RENT_OPERATING_MANAGE.getCode())) {
wxBillAll.setBillTypeValue(EnumBillQueryType.RENT_OPERATING_MANAGE.getCode());
wxBillAll.setBillTypeName(EnumBillQueryType.RENT_OPERATING_MANAGE.getMessage());
wxBillAll.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode());
maps = wxBillAllMapper.listRentManageBillData(wxBillAll);
} else { } else {
logger.info("账单不存在"); logger.info("账单不存在");
} }


+ 5
- 13
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Прегледај датотеку

@@ -326,23 +326,15 @@
<include refid="billSql"/> <include refid="billSql"/>
</select> </select>
<select id="listRentBussinessManageBillData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll">
select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,'商业管理费' name,11 billTypeValue,'商业管理费' billType,
bussiness_manage_fee_need_pay needPay,bussiness_manage_fee_need_pay receivePay,bussiness_manage_fee_need_pay pay,bussiness_manage_fee_need_pay owe,
<select id="listRentManageBillData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll">
select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,#{billTypeName} name,#{manageFeeType} billTypeValue,#{billTypeName} billType,
need_pay needPay,receive_pay receivePay,pay pay,(receive_pay+service_charge_pay+ifnull(late_pay_price,0)-pay) owe,
receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,status,starttime,endtime,rent_shop_type rentShopType,'' priceDetail, receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,status,starttime,endtime,rent_shop_type rentShopType,'' priceDetail,
freeze,ifnull(late_pay_price,0) latePayPrice,service_charge_pay serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime freeze,ifnull(late_pay_price,0) latePayPrice,service_charge_pay serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime
from wx_bill_rent bill
where bill.is_preview = 0
from wx_bill_rent_manage bill
where bill.manage_fee_type = #{manageFeeType}
and rent_contract_id in (select id from wx_rent_contract where status in (2,3,4)) and rent_contract_id in (select id from wx_rent_contract where status in (2,3,4))
select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,
'商业管理费' name,11 billTypeValue,'商业管理费' billType, 0 as needPay,receive_pay receivePay,
pay,(receive_pay+service_charge_pay-pay) owe,receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,status,starttime,endtime,
rent_shop_type rentShopType,price_detail priceDetail,freeze,0 latePayPrice,service_charge_pay serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime
from wx_bill_daily bill where bill.merchant_id=#{merchantId}
<include refid="billSql"/> <include refid="billSql"/>
</select> </select>


Loading…
Откажи
Сачувај