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

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

@@ -170,6 +170,9 @@ public class WxFinanceReceive extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "是否已打印", name = "isPrint")
private Integer isPrint;
@io.swagger.annotations.ApiModelProperty(value = "父编号,红冲单据", name = "parentId")
private Long parentId;
@TableField(exist = false)
private List<WxAllBill> bills;
@TableField(exist = false)


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

@@ -1421,6 +1421,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
record.setPayMoney("-"+record.getPayMoney());
}
record.setStatus(EnumFinanceReceiveStatus.RED_SETOFF.getCode());
record.setParentId(oldRecordId);
wxFinanceReceiveMapper.insert(record);
WxFinanceReceiveBill rbq = new WxFinanceReceiveBill();


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

@@ -25,12 +25,12 @@
<result column="fees_id" jdbcType="BIGINT" property="feesId"/>
<result column="is_print" jdbcType="INTEGER" property="isPrint"/>
<result column="is_finish" jdbcType="INTEGER" property="isFinish"/>
<result column="parent_id" jdbcType="BIGINT" property="parentId"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`receive_date`,`receive_money`,`pay_money`,`set_off_money`,`cut_money`,`status`,`type`,
`money_detail`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`rent_shop_type`,`remark`,
`fees_id`,`is_print`,`is_finish`
`money_detail`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`rent_shop_type`,`remark`,`fees_id`,`is_print`,`is_finish`,`parent_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -54,6 +54,7 @@
<if test=" null != rentShopType ">and `rent_shop_type` = #{rentShopType}</if>
<if test=" null != isPrint ">and `is_print` = #{isPrint}</if>
<if test=" null != isFinish ">and `is_finish` = #{isFinish}</if>
<if test=" null != parentId ">and `parent_id` = #{parentId}</if>
<if test=" null != merchantIdList ">
and merchant_id in
<foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")">


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