Sfoglia il codice sorgente

[日常费用合同][添加][类型字段]

release_toaliyun_real
gongbiao 7 anni fa
parent
commit
46f413e154
3 ha cambiato i file con 57 aggiunte e 3 eliminazioni
  1. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  2. +38
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumBillDailyType.java
  3. +8
    -3
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml

+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java Vedi File

@@ -51,6 +51,17 @@ public class WxBillDaily implements Serializable {
this.merchantName = merchantName; this.merchantName = merchantName;
} }


@io.swagger.annotations.ApiModelProperty(value="账单类型",name="type")
private Integer type;

public Integer getType() {
return type;
}

public void setType(Integer type) {
this.type = type;
}

/*实际应收金额**/ /*实际应收金额**/
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay")
private Integer receivePay; private Integer receivePay;


+ 38
- 0
mallinkService/src/main/java/com/iformall/enums/EnumBillDailyType.java Vedi File

@@ -0,0 +1,38 @@
package com.iformall.enums;


/**
* @author gongbiao
*/

public enum EnumBillDailyType {

WATER(1,"水费"),
POWER(2,"电费"),
;

public static EnumBillDailyType getEnum(Integer code) {
for (EnumBillDailyType value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumBillDailyType(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 8
- 3
mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml Vedi File

@@ -17,10 +17,12 @@
<result column="user_id" jdbcType="BIGINT" property="userId" /> <result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="shop_id" jdbcType="BIGINT" property="shopId" /> <result column="shop_id" jdbcType="BIGINT" property="shopId" />
<result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
<result column="type" jdbcType="INTEGER" property="type" />
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`
`id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`type`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -39,7 +41,9 @@
<if test=" null != merchantId "> and `merchant_id` = #{merchantId} </if> <if test=" null != merchantId "> and `merchant_id` = #{merchantId} </if>
<if test=" null != userId "> and `user_id` = #{userId} </if> <if test=" null != userId "> and `user_id` = #{userId} </if>
<if test=" null != shopId "> and `shop_id` = #{shopId} </if> <if test=" null != shopId "> and `shop_id` = #{shopId} </if>
<if test=" null != updatetime "> and `updatetime` = #{updatetime} </if>
<if test=" null != updatetime "> and `updatetime` = #{updatetime} </if>
<if test=" null != type "> and `type` = #{type} </if>
<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -58,7 +62,7 @@
select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate,
br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`,
m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,
br.`merchant_id` merchantId,br.shop_id shopId
br.`merchant_id` merchantId,br.shop_id shopId,br.type
from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id left join wx_shop s on br.shop_id=s.id
<where> <where>
@@ -68,6 +72,7 @@
<if test=" null != tenantId ">and br.`tenant_id` = #{tenantId}</if> <if test=" null != tenantId ">and br.`tenant_id` = #{tenantId}</if>
<if test=" null != status ">and br.`status` = #{status}</if> <if test=" null != status ">and br.`status` = #{status}</if>
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if> <if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != type ">and br.`type` = #{type}</if>
</where> </where>
order by id order by id
</select> </select>


Caricamento…
Annulla
Salva