diff --git a/mallinkAdmin/src/main/resources/db/migration/V201910241500__W_INVEST_ALTER.sql b/mallinkAdmin/src/main/resources/db/migration/V201910241500__W_INVEST_ALTER.sql new file mode 100644 index 000000000..920f76d95 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201910241500__W_INVEST_ALTER.sql @@ -0,0 +1 @@ +ALTER TABLE `invest_task` ADD COLUMN `last_time` datetime DEFAULT NULL COMMENT '最晚出租时间' AFTER `content`; \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index 142dd779c..d5ea4ee60 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -63,7 +63,9 @@ public class WxMerchantSubsidyController extends BaseController { if (null == wxMerchantSubsidy) { wxMerchantSubsidy = new WxMerchantSubsidyVo(); } - wxMerchantSubsidy.setTenantId(getTenantId()); + WxMerchantBUser user = getUser(); + wxMerchantSubsidy.setTenantId(user.getTenantId()); + wxMerchantSubsidy.setMerchantId(user.getMerchantId()); Map data = wxMerchantSubsidyService.summary(wxMerchantSubsidy); return new ResultData(data); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 16a10c509..609f2ee6c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -122,7 +122,7 @@ public class WxOrder extends BaseEntity { } public String getPaymentStr() { - return payment != null ? new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString() : payStr; + return payment != null ? new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString() : paymentStr; } @Excel(name = "订单金额(元)", width = 20, orderNum = "6") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestTaskEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestTaskEntity.java index 0c360ebbc..3e625a5f2 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestTaskEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestTaskEntity.java @@ -24,7 +24,7 @@ import java.util.Date; public class InvestTaskEntity extends InvestBaseEntity { public static final String KEY_CONTRACT_ID = "contractId" ; - public static final String KEY_CONTRACT_TYPE = "ContractType" ; + public static final String KEY_CONTRACT_TYPE = "contractType" ; /** * 负责人 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index e7889159b..30a419537 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -85,6 +85,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { e.setServiceChargePay(servicePay.intValue()); if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { e.setOwe(0L); + } else { + e.setOwe(realReceivePay - e.getPay()); } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 1affcfc74..2e1b90847 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -50,13 +50,13 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Override public PageInfo listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + //WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); PageHelper.startPage(pageIndex, pageSize); List billDepositList = wxBillDepositMapper.queryBillDepositList(record); - billDepositList.stream().forEach(e->{ +/* billDepositList.stream().forEach(e->{ //手续费 = 合同应收+手续费+滞纳金 computeTotalMoney(wxPayAccountBill, e); - }); + });*/ PageInfo pageInfo = new PageInfo<>(billDepositList); return pageInfo; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 18f3416aa..d021d5bdb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -80,6 +80,8 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService e.setServiceChargePay(servicePay.intValue()); if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { e.setOwe(0L); + } else { + e.setOwe(realReceivePay - e.getPay()); } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 1ece26969..b333990cf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -80,6 +80,8 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { e.setServiceChargePay(servicePay.intValue()); if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { e.setOwe(0L); + } else { + e.setOwe(realReceivePay - e.getPay()); } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index f64a20240..5b9159168 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -87,6 +87,8 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { e.setServiceChargePay(servicePay.intValue()); if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { e.setOwe(0L); + } else { + e.setOwe(realReceivePay - e.getPay()); } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 6dc653cc6..e6be60b48 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -89,6 +89,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { rent.setServiceChargePay(servicePay.intValue()); if (!rent.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { rent.setOwe(0L); + } else { + rent.setOwe(realReceivePay - rent.getPay()); } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index 62292345b..1c53e92c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -83,7 +83,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { Long subsidy = summary.get("subsidy"); String subsidyStr = new BigDecimal(subsidy).divide(new BigDecimal(100)).toPlainString(); WxMerchantSubsidyVo merchantSubsidy = new WxMerchantSubsidyVo(); - merchantSubsidy.setSubsidyStr(subsidyStr); + merchantSubsidy.setSubsidyStr("承付总金额(元): " + subsidyStr); merchantSubsidy.setSource(-1); merchantSubsidy.setType(-1); merchantSubsidy.setFreeze(-1); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index ec4991a12..5ccf892eb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1058,8 +1058,8 @@ public class WxOrderServiceImpl implements WxOrderService { String paymentStr = new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString(); String payStr = new BigDecimal(pay).divide(new BigDecimal(100)).toPlainString(); WxOrder order = new WxOrder(); - order.setPayStr(payStr); - order.setPaymentStr(paymentStr); + order.setPayStr("支付总金额(元): " + payStr); + order.setPaymentStr("订单总金额(元): " + paymentStr); order.setOrderStatus(-1); order.setAttribute(-1); list.add(order); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 370ec72eb..ea84f9429 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -92,6 +92,8 @@ public class InvestBizServiceImpl implements InvestBizService { } List demandList = demandService.list(new LambdaQueryWrapper<>(demandParams)); LambdaQueryWrapper queryWrapperCustomer = new LambdaQueryWrapper<>(customerParams); + queryWrapperCustomer.like(StringUtils.isNotBlank(params.getCustomerNo()), InvestCustomerEntity::getCustomerNo, params.getCustomerNo()); + if (Objects.isNull(InvestUserContext.getDataUser())) { if (CollectionUtils.isEmpty(demandList) && Objects.nonNull(params.getDemandOwner())) { return investPage; @@ -105,7 +107,7 @@ public class InvestBizServiceImpl implements InvestBizService { queryWrapperCustomer.in(CollectionUtils.isNotEmpty(demandList),InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); } } - queryWrapperCustomer.like(StringUtils.isNotBlank(params.getCustomerNo()), InvestCustomerEntity::getCustomerNo, params.getCustomerNo()); + queryWrapperCustomer.orderByDesc(InvestCustomerEntity::getCreateDate); InvestPageResult customers = customerService.queryPage(buildPageQuery(params, null), queryWrapperCustomer); List resultList = getTargeInfoList(demandList, customers.getRecords()); @@ -325,7 +327,7 @@ public class InvestBizServiceImpl implements InvestBizService { InvestDemandDto customerBase = convetCustomer(customer, brandMap, businesseMap, shopMap, customerMap); if (customerBase == null) { stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); - log.error("userBasenull"); + log.error("customerBase null"); } saveCustomerAndDemand(customerBase) ; }); @@ -421,9 +423,8 @@ public class InvestBizServiceImpl implements InvestBizService { private InvestDemandDto doConvertDemand(InvestDemandQuery params) { InvestCustomerEntity customerEntity = null; - if (ObjectUtils.anyNotNull(params.getCustomerNo(), params.getCustomerType(), params.getBusinessId())) { + if (ObjectUtils.anyNotNull(params.getCustomerType(), params.getBusinessId())) { customerEntity = new InvestCustomerEntity(); - customerEntity.setCustomerNo(params.getCustomerNo()); customerEntity.setType(params.getCustomerType()); customerEntity.setBusinessId(params.getBusinessId()); } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java index f8f0a72b0..193399f64 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java @@ -33,7 +33,7 @@ public class InvestFollowRecordServiceImpl extends InvestBaseServiceImpl updateWrapper) { super.updateActon(entity, updateWrapper, this::checkBeforeSaveOrUpdate); @@ -43,7 +43,7 @@ public class InvestTaskServiceImpl extends InvestBaseServiceImpl union all select id,merchant_id,shop_id,tenant_id,'欠缴押金' name,8 bill_type_value,'欠缴押金' bill_type,0 as @@ -804,13 +804,13 @@ select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,late_pay_price from wx_bill_rent where is_preview = 0 and status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from + select merchant_id,receive_pay,0 receivePay,0 late_pay_price from wx_bill_rent_deposit where status not in(3,6) union all select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,late_pay_price from wx_bill_property where is_preview = 0 and status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from + select merchant_id,receive_pay,0 receivePay,0 late_pay_price from wx_bill_property_deposit where status not in(3,6) union all select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from @@ -849,13 +849,13 @@ wx_bill_rent where is_preview = 0 and status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from + select merchant_id,receive_pay,0 receivePay,0 late_pay_price from wx_bill_rent_deposit where status not in(3,6) union all select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,late_pay_price from wx_bill_property where is_preview = 0 and status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from + select merchant_id,receive_pay,0 receivePay,0 late_pay_price from wx_bill_property_deposit where status not in(3,6) union all select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index bbe2ca89e..958eadc43 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -181,7 +181,8 @@ - update wx_bill_property set is_preview = #{isPreview},merchant_id = #{merchantId},need_pay = receive_pay,owe=receive_pay + update wx_bill_property set is_preview = #{isPreview},merchant_id = #{merchantId},need_pay = receive_pay, + owe=receive_pay + service_charge_pay + ifnull(late_pay_price,0) - pay where property_contract_id = #{propertyContractId} @@ -270,7 +271,7 @@ - update wx_bill_property set service_charge_pay=round(receive_pay*#{serviceChargeRate}/10000) where tenant_id=#{tenantId} and service_charge_pay=0 and status in(1,2,4) + update wx_bill_property set service_charge_pay=round(receive_pay*#{serviceChargeRate}/10000),owe=receive_pay + service_charge_pay + ifnull(late_pay_price,0) - pay where tenant_id=#{tenantId} and service_charge_pay=0 and status in(1,2,4) diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index e063bd4d1..c32d69594 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -188,7 +188,8 @@ - update wx_bill_rent set is_preview = #{isPreview},merchant_id = #{merchantId},need_pay = receive_pay,owe=receive_pay + update wx_bill_rent set is_preview = #{isPreview},merchant_id = #{merchantId},need_pay = receive_pay, + owe=receive_pay + service_charge_pay + ifnull(late_pay_price,0) - pay where rent_contract_id = #{rentContractId} @@ -276,7 +277,7 @@ - update wx_bill_rent set service_charge_pay=round(receive_pay*#{serviceChargeRate}/10000) where tenant_id=#{tenantId} and service_charge_pay=0 and status in(1,2,4) + update wx_bill_rent set service_charge_pay=round(receive_pay*#{serviceChargeRate}/10000),owe=receive_pay + service_charge_pay + ifnull(late_pay_price,0) - pay where tenant_id=#{tenantId} and service_charge_pay=0 and status in(1,2,4) diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index c4df36f02..906094fcc 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -560,6 +560,7 @@ left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id where o.tenant_id=#{tenantId} and c.type!=100 and o.order_status in(0,1,2,3,4,5) + and ifnull(press_current_num,0)=0 and ifnull(order_group_id)=0 union all select o.id,o.order_number,o.tenant_id,o.product_id,o.payment, case o.order_status when 6 then 0 when 7 then 0 @@ -567,7 +568,7 @@ c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,3 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id - where o.tenant_id=#{tenantId} and c.type=8 and o.payment=c.sale_price + where o.tenant_id=#{tenantId} and c.type=8 and press_current_num>0 union all select o.id,o.order_number,o.tenant_id,o.product_id,o.payment, case o.order_status when 10 then 1 when 11 then 1 @@ -576,7 +577,7 @@ c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,4 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id - where o.tenant_id=#{tenantId} and c.type=9 and o.payment=c.sale_price + where o.tenant_id=#{tenantId} and c.type=9 and order_group_id>0 ) o