Просмотр исходного кода

fix contract

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
e8e1af20cd
6 измененных файлов: 16 добавлений и 20 удалений
  1. +1
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +12
    -2
      mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
  4. +0
    -2
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  5. +0
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  6. +2
    -2
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 1
- 4
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -109,12 +109,9 @@ public class WxRentContractController extends WxContractBaseController {
// if (wxMerchantService.hasMerchant(wxMerchant)) {
// return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND);
// }
//查询商户是否存在计租中合同
if (!wxRentContractService.hasContract(wxRentContract)){
return new ResultData(ErrorCode.MERCHANT_HASRENTCONTRACT);
}
MallUserInfo user = getUser();
wxRentContract.updateTenantInfo(user);
//wxRentContract.setTenantId("789");
wxRentContract.setAdjustPeriodHandle();
Date oldDate = wxRentContract.getRentalStartDate();
if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){


+ 12
- 2
mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql Просмотреть файл

@@ -38,9 +38,9 @@ ALTER TABLE `wx_coupon_order`
ADD COLUMN `pay_vendor` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '订单渠道,EnumPayWay.class';

UPDATE wx_coupon_order o INNER JOIN wx_pay_order po ON po.order_id = o.`id` SET o.pay_vendor = po.pay_vendor;

---刷新完之后把DEFAULT 1 去掉


ALTER TABLE `wx_card_spend`
ADD COLUMN `remark` VARCHAR(30) DEFAULT NULL COMMENT '备注';

@@ -50,13 +50,23 @@ ADD COLUMN `plat` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT 'app平台 1:微信 2:
ALTER TABLE `wx_profit_sharing_receiver`
ADD COLUMN `plat` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '平台 1:微信 2:阿里 3:头条';


create table wx_rent_contract_20200826 like wx_rent_contract;
insert into wx_rent_contract_20200826 select * from wx_rent_contract;

ALTER TABLE wx_rent_contract DROP COLUMN shop_id;

create table wx_property_contract_20200826 like wx_property_contract;
insert into wx_property_contract_20200826 select * from wx_property_contract;

ALTER TABLE wx_property_contract DROP COLUMN shop_id;

ALTER TABLE `wx_rent_contract` ADD COLUMN `shop_name` VARCHAR(100) COMMENT '店铺名称';

ALTER TABLE `wx_rent_contract`
ADD COLUMN `from_id` BIGINT(20) DEFAULT NULL COMMENT '来源ID,针对续签,从哪个合同续签';

合同状态为4(即将到期)更新为计租中,合同状态为8(补录),9(续签)更新为草稿。





+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java Просмотреть файл

@@ -79,7 +79,7 @@ public interface WxRentContractMapper extends CommonMapper<WxRentContract, Long>

List<WxRentContract> getAllContractBymerchantId(WxRentContract wxRentContract);

List<WxRentContract> getContractByMerchant(WxRentContract wxRentContract);
//List<WxRentContract> getContractByMerchant(WxRentContract wxRentContract);
Integer getCanApplyCount(@Param("id") Long id);


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

@@ -104,8 +104,6 @@ public interface WxRentContractService {

ResultData apply(WxRentContract wxRentContract,MallUserInfo user);

boolean hasContract(WxRentContract wxRentContract);
/**
* 合同正常到期
* @param wxRentContract


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

@@ -2492,15 +2492,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
}

@Override
public boolean hasContract(WxRentContract wxRentContract) {
List<WxRentContract> list = wxRentContractMapper.getContractByMerchant(wxRentContract);
if (list.isEmpty()){
return true;
}
return false;
}

@Override
public void outDateContract(WxMall wxMall) {
//查询有计租合同的商户


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

@@ -668,9 +668,9 @@
)
</select> -->

<select id="getContractByMerchant" resultType="com.iformall.domain.po.WxRentContract" parameterType="com.iformall.domain.po.WxRentContract">
<!-- <select id="getContractByMerchant" resultType="com.iformall.domain.po.WxRentContract" parameterType="com.iformall.domain.po.WxRentContract">
select * from wx_rent_contract where merchant_id = #{merchantId} and status=3
</select>
</select> -->
<select id="getCanApplyCount" resultType="Integer" parameterType="Long">
select count(1) from wx_rent_contract where id != #{id} and (status=1 or (status=10 and apply_status=3) )


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