Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
48922dc0ce
5 zmienionych plików z 14 dodań i 14 usunięć
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileDeposit.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileDepositShop.java
  3. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java
  4. +3
    -3
      mallinkService/src/main/resources/mapper/WxRentContractAgileDepositMapper.xml
  5. +3
    -3
      mallinkService/src/main/resources/mapper/WxRentContractAgileDepositShopMapper.xml

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileDeposit.java Wyświetl plik

@@ -35,10 +35,10 @@ public class WxRentContractAgileDeposit extends TenantEntity {
private String price; private String price;
@io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime")
private Date createTime;
private Date createtime;
@io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime") @io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime")
private Date updateTime;
private Date updatetime;
@TableField(exist = false) @TableField(exist = false)
private List<WxShop> shopList; private List<WxShop> shopList;


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileDepositShop.java Wyświetl plik

@@ -33,9 +33,9 @@ public class WxRentContractAgileDepositShop extends TenantEntity {
private String shopNumber; private String shopNumber;
@io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime")
private Date createTime;
private Date createtime;
@io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime") @io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime")
private Date updateTime;
private Date updatetime;
} }

+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java Wyświetl plik

@@ -186,8 +186,8 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
rca.setId(idWorker.nextId()); rca.setId(idWorker.nextId());
rca.setFeesId(deposit.getFeesId()); rca.setFeesId(deposit.getFeesId());
rca.setPrice(deposit.getPrice()); rca.setPrice(deposit.getPrice());
rca.setCreateTime(new Date());
rca.setUpdateTime(new Date());
rca.setCreatetime(new Date());
rca.setUpdatetime(new Date());
wxRentContractAgileDepositMapper.insert(rca); wxRentContractAgileDepositMapper.insert(rca);
for (int j = 0 ; j < deposit.getShopList().size(); j ++) { for (int j = 0 ; j < deposit.getShopList().size(); j ++) {
WxShop s = deposit.getShopList().get(j); WxShop s = deposit.getShopList().get(j);
@@ -195,8 +195,8 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
ds.setRentContractId(wxRentContract.getId()); ds.setRentContractId(wxRentContract.getId());
ds.updateTenantInfo(wxRentContract); ds.updateTenantInfo(wxRentContract);
ds.setId(idWorker.nextId()); ds.setId(idWorker.nextId());
ds.setCreateTime(new Date());
ds.setUpdateTime(new Date());
ds.setCreatetime(new Date());
ds.setUpdatetime(new Date());
ds.setShopId(s.getId()); ds.setShopId(s.getId());
ds.setShopNumber(s.getShopNumber()); ds.setShopNumber(s.getShopNumber());
wxRentContractAgileDepositShopMapper.insert(ds); wxRentContractAgileDepositShopMapper.insert(ds);


+ 3
- 3
mallinkService/src/main/resources/mapper/WxRentContractAgileDepositMapper.xml Wyświetl plik

@@ -5,8 +5,8 @@
<id column="id" jdbcType="BIGINT" property="id"/> <id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> <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="createtime" jdbcType="TIMESTAMP" property="createtime"/>
<result column="updatetime" jdbcType="TIMESTAMP" property="updatetime"/>
<result column="rent_contract_id" jdbcType="BIGINT" property="rentContractId"/> <result column="rent_contract_id" jdbcType="BIGINT" property="rentContractId"/>
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
<result column="fees_id" jdbcType="BIGINT" property="feesId"/> <result column="fees_id" jdbcType="BIGINT" property="feesId"/>
@@ -14,7 +14,7 @@
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`rent_contract_id`,`merchant_id`,`fees_id`,`price`
`id`,`tenant_id`,`parent_tenant_id`,`createtime`,`updatetime`,`rent_contract_id`,`merchant_id`,`fees_id`,`price`
</sql> </sql>


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


+ 3
- 3
mallinkService/src/main/resources/mapper/WxRentContractAgileDepositShopMapper.xml Wyświetl plik

@@ -5,8 +5,8 @@
<id column="id" jdbcType="BIGINT" property="id"/> <id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> <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="createtime" jdbcType="TIMESTAMP" property="createtime"/>
<result column="updatetime" jdbcType="TIMESTAMP" property="updatetime"/>
<result column="rent_contract_id" jdbcType="BIGINT" property="rentContractId"/> <result column="rent_contract_id" jdbcType="BIGINT" property="rentContractId"/>
<result column="rent_deposit_id" jdbcType="BIGINT" property="rentDepositId"/> <result column="rent_deposit_id" jdbcType="BIGINT" property="rentDepositId"/>
<result column="shop_id" jdbcType="BIGINT" property="shopId"/> <result column="shop_id" jdbcType="BIGINT" property="shopId"/>
@@ -14,7 +14,7 @@
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`rent_contract_id`,`rent_deposit_id`,`shop_id`,`shop_number`
`id`,`tenant_id`,`parent_tenant_id`,`createtime`,`updatetime`,`rent_contract_id`,`rent_deposit_id`,`shop_id`,`shop_number`
</sql> </sql>


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


Ładowanie…
Anuluj
Zapisz