Przeglądaj źródła

Merge tag 'refs/tags/jenkins-back-end-3094' into release

develop
release_toaliyun_real
gongbiao 6 lat temu
rodzic
commit
f41b20ef99
3 zmienionych plików z 11 dodań i 7 usunięć
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java
  3. +7
    -4
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java Wyświetl plik

@@ -55,6 +55,7 @@ public class InvestDemandEntity extends InvestBaseEntity {
/** /**
* 目标ID * 目标ID
*/ */
@LogColumn
@io.swagger.annotations.ApiModelProperty(value = "目标ID", name = "targetId") @io.swagger.annotations.ApiModelProperty(value = "目标ID", name = "targetId")
private Long targetId; private Long targetId;




+ 3
- 3
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java Wyświetl plik

@@ -857,7 +857,7 @@ public class InvestBizServiceImpl implements InvestBizService {
tableTriple.setBefore(businessBefore.getTitle()); tableTriple.setBefore(businessBefore.getTitle());
} }
if (Objects.nonNull(businessAfter)) { if (Objects.nonNull(businessAfter)) {
tableTriple.setBefore(businessAfter.getTitle());
tableTriple.setAfter(businessAfter.getTitle());
} }
} else if (Objects.equals(column, "brandId")) { } else if (Objects.equals(column, "brandId")) {
WxBrand brandBefore = brandMap.get(tableTriple.getBefore()) ; WxBrand brandBefore = brandMap.get(tableTriple.getBefore()) ;
@@ -866,7 +866,7 @@ public class InvestBizServiceImpl implements InvestBizService {
tableTriple.setBefore(brandBefore.getName()); tableTriple.setBefore(brandBefore.getName());
} }
if (Objects.nonNull(brandAfter)) { if (Objects.nonNull(brandAfter)) {
tableTriple.setBefore(brandAfter.getName());
tableTriple.setAfter(brandAfter.getName());
} }
} else if (Objects.equals(column, "owner")) { } else if (Objects.equals(column, "owner")) {
MallUserInfo userBefore = usersMap.get(tableTriple.getBefore()); MallUserInfo userBefore = usersMap.get(tableTriple.getBefore());
@@ -875,7 +875,7 @@ public class InvestBizServiceImpl implements InvestBizService {
tableTriple.setBefore(userBefore.getName()); tableTriple.setBefore(userBefore.getName());
} }
if (Objects.nonNull(userAfter)) { if (Objects.nonNull(userAfter)) {
tableTriple.setBefore(userAfter.getName());
tableTriple.setAfter(userAfter.getName());
} }
} }
return tableTriple; return tableTriple;


+ 7
- 4
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Wyświetl plik

@@ -914,18 +914,21 @@
<select id="allDepositList" parameterType="com.iformall.domain.vo.WxBillAll" resultMap="allVoResultMap"> <select id="allDepositList" parameterType="com.iformall.domain.vo.WxBillAll" resultMap="allVoResultMap">
select bill.* select bill.*
from ( from (
select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 billTypeValue,'租赁押金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 late_pay_price,0
select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 billTypeValue,'租赁押金','租赁押金'
billType,need_pay,receive_pay receivePay,pay,owe,receive_date receiveDate,pay_date,expired_day,status,freeze,0
late_pay_price,0
service_charge_pay service_charge_pay
from wx_bill_rent_deposit where tenant_id=#{tenantId} from wx_bill_rent_deposit where tenant_id=#{tenantId}
union all union all
select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 billTypeValue,'物业押金' select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 billTypeValue,'物业押金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 late_pay_price,0
billType,need_pay,receive_pay receivePay,pay,owe,receive_date receiveDate,pay_date,expired_day,status,freeze,0
late_pay_price,0
service_charge_pay service_charge_pay
from wx_bill_property_deposit where tenant_id=#{tenantId} from wx_bill_property_deposit where tenant_id=#{tenantId}
union all union all
select id,merchant_id,shop_id,tenant_id,comments as name,8 billTypeValue,concat('其他押金-',comments) as select id,merchant_id,shop_id,tenant_id,comments as name,8 billTypeValue,concat('其他押金-',comments) as
bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0
billType,0 as need_pay,receive_pay receivePay,pay,owe,receive_date
receiveDate,pay_date,expired_day,status,freeze,0
late_pay_price,service_charge_pay late_pay_price,service_charge_pay
from wx_bill_other_deposit where tenant_id=#{tenantId} from wx_bill_other_deposit where tenant_id=#{tenantId}
) bill ) bill


Ładowanie…
Anuluj
Zapisz