winter 1 год назад
Родитель
Сommit
ce70b06346
3 измененных файлов: 9 добавлений и 3 удалений
  1. +4
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveSetoff.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  3. +3
    -1
      mallinkService/src/main/resources/mapper/WxFinanceReceiveSetoffMapper.xml

+ 4
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveSetoff.java Просмотреть файл

@@ -28,7 +28,10 @@ public class WxFinanceReceiveSetoff extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime")
private Date updateTime;
@io.swagger.annotations.ApiModelProperty(value = "预收收款编号", name = "advanceId")
@io.swagger.annotations.ApiModelProperty(value = "收款单编号", name = "advanceId")
private Long receiveId;
@io.swagger.annotations.ApiModelProperty(value = "收收款编号", name = "advanceId")
private Long advanceId;
@io.swagger.annotations.ApiModelProperty(value = "账单编号", name = "billId")


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Просмотреть файл

@@ -745,6 +745,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
WxFinanceReceiveSetoff rb = new WxFinanceReceiveSetoff();
rb.updateTenantInfo(addreceive);
rb.setAdvanceId(advance.getId());
rb.setReceiveId(addreceive.getId());
rb.setBillId(bill.getId());
rb.setBillType(bill.getBillType());
rb.setFeesId(bill.getEnergyFeesId());
@@ -990,7 +991,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
rsq.updateTenantInfo(record);
rsq.setBillId(bill.getId());
rsq.setBillType(bill.getBillType());
rsq.setAdvanceId(rb.getReceiveId());
rsq.setReceiveId(rb.getReceiveId());
List<WxFinanceReceiveSetoff> setoffList = wxFinanceReceiveSetoffMapper.findList(rsq);
if (null != setoffList) {
for (int j = 0 ; j < setoffList.size() ; j ++) {


+ 3
- 1
mallinkService/src/main/resources/mapper/WxFinanceReceiveSetoffMapper.xml Просмотреть файл

@@ -7,6 +7,7 @@
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="receive_id" jdbcType="BIGINT" property="receiveId"/>
<result column="bill_id" jdbcType="BIGINT" property="billId"/>
<result column="bill_type" jdbcType="INTEGER" property="billType"/>
<result column="fees_id" jdbcType="BIGINT" property="feesId"/>
@@ -20,7 +21,7 @@

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`bill_id`,`bill_type`,`fees_id`,
`advance_id`,`setoff`,`merchant_id`,`starttime`,`endtime`,`is_del`
`receive_id`,`advance_id`,`setoff`,`merchant_id`,`starttime`,`endtime`,`is_del`
</sql>

<sql id="dynamicWhereConditions">
@@ -33,6 +34,7 @@
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != billId ">and `bill_id` = #{billId}</if>
<if test=" null != receiveId ">and `receive_id` = #{receiveId}</if>
<if test=" null != billType ">and `bill_type` = #{billType}</if>
<if test=" null != feesId ">and `fees_id` = #{feesId}</if>
<if test=" null != advanceId ">and `advance_id` = #{advanceId}</if>


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