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

Merge tag 'refs/tags/jenkins-back-end-3250' into SiChuan

release
release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
ba9bac4804
3 измененных файлов: 22 добавлений и 6 удалений
  1. +5
    -5
      mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java
  2. +11
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  3. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 5
- 5
mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java Просмотреть файл

@@ -52,11 +52,11 @@ public class PosAppTest {
private static final String devReqKey = "qVH2YDmXJ$ok4a95"; private static final String devReqKey = "qVH2YDmXJ$ok4a95";
private static final String devResKey = "VE#1fB2PhUe@&3Of"; private static final String devResKey = "VE#1fB2PhUe@&3Of";


private static final String tenantId = "456";
private static final String merchantId = "320833942159982592"; // 东软专用
private static final String buUserId = "320834180694245376";
private static final String phone = "13120223636";
private static final String password = "drpos345";
private static final String tenantId = "789";
private static final String merchantId = "387135542874869760"; // 东软专用
private static final String buUserId = "387136487880921088";
private static final String phone = "13120220020";
private static final String password = "123456zz";


private static final String posSN = "1"; private static final String posSN = "1";




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

@@ -45,6 +45,7 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@@ -151,11 +152,20 @@ public class WxFlowServiceImpl implements WxFlowService {
rent.setBusinessType(flowType); rent.setBusinessType(flowType);
wxRentContractService.updateApplyStatus(rent); wxRentContractService.updateApplyStatus(rent);


//如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约)
WxRentContract record = wxRentContractMapper.selectById(businessId); WxRentContract record = wxRentContractMapper.selectById(businessId);
//合并的合同-审批时 物业合同的状态肯定不在 签约中 避免更新物业合同时提示店铺存在
if(record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())){
WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.setRentContractId(record.getId());
wxPropertyContract.setStatus(EnumRentContractStatus.INTENTION.getCode());
wxPropertyContractMapper.updateStatusByRentContractId(wxPropertyContract);
}

//如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约)
if(record != null && record.getMerchantId()!=null && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { if(record != null && record.getMerchantId()!=null && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) {
wxRentContractService.updateRentContractStatus(businessId); wxRentContractService.updateRentContractStatus(businessId);
} }

}else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){ }else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){
WxPropertyContract wxPropertyContract = new WxPropertyContract(); WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.setId(businessId); wxPropertyContract.setId(businessId);


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

@@ -387,6 +387,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
record.setPrice(record.getPrice() != null ? record.getPrice() : 0); record.setPrice(record.getPrice() != null ? record.getPrice() : 0);
record.setDeposit(record.getDeposit() != null ? record.getDeposit() : 0); record.setDeposit(record.getDeposit() != null ? record.getDeposit() : 0);
record.setUpdatetime(new Date()); record.setUpdatetime(new Date());

//如果是合并合同 物业合同的状态为 意向
if (record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())) {
record.setStatus(EnumRentContractStatus.INTENTION.getCode());
}

if (CollectionUtils.isEmpty(record.getFlowParams())) { if (CollectionUtils.isEmpty(record.getFlowParams())) {
hasFlow = false; hasFlow = false;
record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode());


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