Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
ee97261b94
8 zmienionych plików z 26 dodań i 4 usunięć
  1. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  3. +6
    -0
      mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  6. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  7. +3
    -1
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
  8. +3
    -2
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Wyświetl plik

@@ -82,6 +82,9 @@ public class WxPropertyContractController extends WxContractBaseController {
wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds());
wxPropertyContract.setShopTypeForRule(dataRule.getShopTypes()); wxPropertyContract.setShopTypeForRule(dataRule.getShopTypes());
} }
if (null == wxPropertyContract.getIsPrivateMerchant()) {
wxPropertyContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode());
}
PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize);
Integer hasFlow = null; Integer hasFlow = null;
if (null != pageInfo && null != pageInfo.getList()) { if (null != pageInfo && null != pageInfo.getList()) {
@@ -210,6 +213,7 @@ public class WxPropertyContractController extends WxContractBaseController {
wxPropertyContract.setLinkPerson(merchant.getLinkPerson()); wxPropertyContract.setLinkPerson(merchant.getLinkPerson());
wxPropertyContract.setLinkPhone(merchant.getLinkPhone()); wxPropertyContract.setLinkPhone(merchant.getLinkPhone());
//wxPropertyContract.setRentShopType(merchant.getType()); //wxPropertyContract.setRentShopType(merchant.getType());
wxPropertyContract.setIsPrivateMerchant(merchant.getIsPrivate());
wxPropertyContract.setRentStartType(EnumRentStartType.RENTTIME.getCode()); wxPropertyContract.setRentStartType(EnumRentStartType.RENTTIME.getCode());
return wxPropertyContractService.save(wxPropertyContract, user, user.getName(),false); return wxPropertyContractService.save(wxPropertyContract, user, user.getName(),false);


+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Wyświetl plik

@@ -78,6 +78,9 @@ public class WxRentContractController extends WxContractBaseController {
wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); wxRentContract.setBusinessForRule(dataRule.getBussinessIds());
wxRentContract.setShopTypeForRule(dataRule.getShopTypes()); wxRentContract.setShopTypeForRule(dataRule.getShopTypes());
} }
if (null == wxRentContract.getIsPrivateMerchant()) {
wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode());
}
PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize);
Integer hasFlow = null; Integer hasFlow = null;
if (null != page && null != page.getList()) { if (null != page && null != page.getList()) {


+ 6
- 0
mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql Wyświetl plik

@@ -270,5 +270,11 @@ CREATE TABLE `wx_shop_users_person` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='商铺'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='商铺';




ALTER TABLE wx_rent_contract ADD is_private_merchant INT(1) NOT NULL DEFAULT 0 COMMENT '是否私密商户' AFTER merchant_id;
ALTER TABLE wx_property_contract ADD is_private_merchant INT(1) NOT NULL DEFAULT 0 COMMENT '是否私密商户' AFTER merchant_id;









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

@@ -55,6 +55,8 @@ public class WxPropertyContract extends TenantEntity {
private Integer decimalSize = 2; private Integer decimalSize = 2;
@io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId") @io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId")
private Long merchantId; private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value = "是不是私密商户(虚拟)", name = "isPrivateMerchant")
private Integer isPrivateMerchant;
/*月租金/分成(分)**/ /*月租金/分成(分)**/
@io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price") @io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price")
private String price; private String price;


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

@@ -228,6 +228,8 @@ public class WxRentContract extends TenantEntity {
private Integer decimalSize = Constant.default_short_decimal_size ; private Integer decimalSize = Constant.default_short_decimal_size ;
@io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId")
private Long merchantId; private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value = "是不是私密商户(虚拟)", name = "isPrivateMerchant")
private Integer isPrivateMerchant;
@io.swagger.annotations.ApiModelProperty(value = "月租金/分成(元)", name = "price") @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(元)", name = "price")
private String price; private String price;
@TableField(exist = false) @TableField(exist = false)


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Wyświetl plik

@@ -429,7 +429,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
shopName = shopName +","+ shopNumber; shopName = shopName +","+ shopNumber;
} }
} }
//
WxMerchant merchant = wxMerchantMapper.selectById(record.getMerchantId());
record.setIsPrivateMerchant(merchant.getIsPrivate());
try { try {
record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode());
record.setStatus(EnumRentContractStatus.UNWRITE.getCode()); record.setStatus(EnumRentContractStatus.UNWRITE.getCode());


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

@@ -4,6 +4,7 @@
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxPropertyContract"> <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxPropertyContract">
<id column="id" jdbcType="BIGINT" property="id"/> <id column="id" jdbcType="BIGINT" property="id"/>
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
<result column="is_private_merchant" jdbcType="INTEGER" property="isPrivateMerchant"/>
<result column="decimal_size" jdbcType="INTEGER" property="decimalSize"/> <result column="decimal_size" jdbcType="INTEGER" property="decimalSize"/>
<result column="price" jdbcType="VARCHAR" property="price"/> <result column="price" jdbcType="VARCHAR" property="price"/>
<result column="rental_start_date" jdbcType="TIMESTAMP" property="rentalStartDate"/> <result column="rental_start_date" jdbcType="TIMESTAMP" property="rentalStartDate"/>
@@ -71,7 +72,7 @@
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`merchant_id`,`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`create_type`,`shop_ids`,`shop_numbers`,
`id`,`merchant_id`,`is_private_merchant`,`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`create_type`,`shop_ids`,`shop_numbers`,
`sign_date`,`receive_period`,`tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`, `sign_date`,`receive_period`,`tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`,
`deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`receive_period_unit`,`create_by`,`update_by`,`first_bill_receive_date`, `deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`receive_period_unit`,`create_by`,`update_by`,`first_bill_receive_date`,
`shop_type`,`updatetime`,`createtime`,`rent_area`,`fees_standards_info`,`first_bill_date_start`,`first_bill_date_end`, `shop_type`,`updatetime`,`createtime`,`rent_area`,`fees_standards_info`,`first_bill_date_start`,`first_bill_date_end`,
@@ -84,6 +85,7 @@
where 1 = 1 where 1 = 1
<if test=" null != id ">and `id` = #{id}</if> <if test=" null != id ">and `id` = #{id}</if>
<if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if> <if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if>
<if test=" null != isPrivateMerchant ">and `is_private_merchant` = #{isPrivateMerchant}</if>
<if test=" null != price ">and `price` = #{price}</if> <if test=" null != price ">and `price` = #{price}</if>
<if test=" null != rentalStartDate ">and `rental_start_date` = #{rentalStartDate}</if> <if test=" null != rentalStartDate ">and `rental_start_date` = #{rentalStartDate}</if>
<if test=" null != rentalEndDate ">and `rental_end_date` = #{rentalEndDate}</if> <if test=" null != rentalEndDate ">and `rental_end_date` = #{rentalEndDate}</if>


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

@@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxRentContract"> <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxRentContract">
<id column="id" jdbcType="BIGINT" property="id"/> <id column="id" jdbcType="BIGINT" property="id"/>
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
<result column="is_private_merchant" jdbcType="INTEGER" property="isPrivateMerchant"/>
<result column="shop_type_sub" jdbcType="VARCHAR" property="shopTypeSub"/> <result column="shop_type_sub" jdbcType="VARCHAR" property="shopTypeSub"/>
<result column="lease_purpose" jdbcType="VARCHAR" property="leasePurpose"/> <result column="lease_purpose" jdbcType="VARCHAR" property="leasePurpose"/>
<result column="contractual_rules" jdbcType="VARCHAR" property="contractualRules"/> <result column="contractual_rules" jdbcType="VARCHAR" property="contractualRules"/>
@@ -132,7 +132,7 @@
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`merchant_id`,
`id`,`merchant_id`,`is_private_merchant`,
`shop_type_sub`,`lease_purpose`,`contractual_rules`,`delivery_date`,`delivery_grace_period`,`opening_date`,`business_hours`,`scope_metre`, `shop_type_sub`,`lease_purpose`,`contractual_rules`,`delivery_date`,`delivery_grace_period`,`opening_date`,`business_hours`,`scope_metre`,
`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`receive_period_unit`, `decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`receive_period_unit`,
`tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`,`create_by`,`update_by`, `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`,`create_by`,`update_by`,
@@ -155,6 +155,7 @@
<if test=" null != id ">and `id` = #{id}</if> <if test=" null != id ">and `id` = #{id}</if>
<if test=" null != fromId ">and `from_id` = #{fromId}</if> <if test=" null != fromId ">and `from_id` = #{fromId}</if>
<if test=" null != merchantId and '' != merchantId">and `merchant_id` = #{merchantId}</if> <if test=" null != merchantId and '' != merchantId">and `merchant_id` = #{merchantId}</if>
<if test=" null != isPrivateMerchant and '' != isPrivateMerchant">and `is_private_merchant` = #{isPrivateMerchant}</if>
<if test=" null != price and '' != price">and `price` = #{price}</if> <if test=" null != price and '' != price">and `price` = #{price}</if>
<if test=" null != rentalStartDate and '' != rentalStartDate">and `rental_start_date` = #{rentalStartDate}</if> <if test=" null != rentalStartDate and '' != rentalStartDate">and `rental_start_date` = #{rentalStartDate}</if>
<if test=" null != rentalEndDate and '' != rentalEndDate">and `rental_end_date` = #{rentalEndDate}</if> <if test=" null != rentalEndDate and '' != rentalEndDate">and `rental_end_date` = #{rentalEndDate}</if>


Ładowanie…
Anuluj
Zapisz