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

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

@@ -105,6 +105,9 @@ public class WxFinanceReceiveBill extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="账单结束周期",name="endtime") @io.swagger.annotations.ApiModelProperty(value="账单结束周期",name="endtime")
private Date endtime; private Date endtime;
@io.swagger.annotations.ApiModelProperty(value="支付时间",name="receiveDate")
private Date receiveDate;
@io.swagger.annotations.ApiModelProperty(value = "是否已删除", name = "isDel") @io.swagger.annotations.ApiModelProperty(value = "是否已删除", name = "isDel")
private Integer isDel; private Integer isDel;


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

@@ -934,6 +934,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
frbs.setId(idWorker.nextId()); frbs.setId(idWorker.nextId());
frbs.setReceiveId(addreceive.getId()); frbs.setReceiveId(addreceive.getId());
frbs.setReceiveDate(addreceive.getReceiveDate());
frbs.setBillId(bill.getId()); frbs.setBillId(bill.getId());
frbs.setBillType(bill.getBillType()); frbs.setBillType(bill.getBillType());
frbs.setFeesId(bill.getEnergyFeesId()); frbs.setFeesId(bill.getEnergyFeesId());


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

@@ -19,11 +19,12 @@
<result column="endtime" jdbcType="TIMESTAMP" property="endtime"/> <result column="endtime" jdbcType="TIMESTAMP" property="endtime"/>
<result column="is_del" jdbcType="INTEGER" property="isDel"/> <result column="is_del" jdbcType="INTEGER" property="isDel"/>
<result column="type" jdbcType="INTEGER" property="type"/> <result column="type" jdbcType="INTEGER" property="type"/>
<result column="receive_date" jdbcType="TIMESTAMP" property="receiveDate"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`bill_id`,`bill_type`,`fees_id`, `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`bill_id`,`bill_type`,`fees_id`,
`pay_way`,`receive_id`,`receive`,`pay`,`merchant_id`,`starttime`,`endtime`,`is_del`,`type`
`pay_way`,`receive_id`,`receive`,`pay`,`merchant_id`,`starttime`,`endtime`,`is_del`,`type`,`receive_date`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


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