Browse Source

Merge tag 'refs/tags/jenkins-back-end-1163' into release

develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
release_toaliyun_real
luozukai 7 years ago
parent
commit
4249d514e2
3 changed files with 29 additions and 22 deletions
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java
  2. +13
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  3. +13
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java View File

@@ -96,6 +96,9 @@ public class WxCampaignController extends BaseController {
@PostMapping("updateStatus")
public ResultData updateStatus(@RequestBody WxCampaign wxCampaign) {
logger.debug("[" + getIpAddr() + "] WxCampaignController::updateStatus");
if(wxCampaign.getType() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "type不能为空");
}
// check coupon 状态
if (wxCampaign.getType().equals(EnumCampaignType.STABLE.getCode())) {
if (wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) {


+ 13
- 11
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java View File

@@ -270,26 +270,28 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}

//查询预账单用于展示
WxBillProperty wxBillRent = new WxBillProperty();
wxBillRent.setPropertyContractId(record.getId());
wxBillRent.setSortColumns(WxBillProperty.Field.Period_ASC);
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
List<WxBillProperty> billList = wxBillPropertyMapper.findList(wxBillRent);
record.setPreviewBillRentList(billList);

//生成预览账单
if(!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod())
if(CollectionUtils.isEmpty(billList) ||
(!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod())
||!wxPropertyContract.getPrice().equals(record.getPrice())
||!wxPropertyContract.getDeposit().equals(record.getDeposit())
||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod())){
||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod())
)){
wxBillPropertyMapper.deletePreviewBill(record);
//重新生成
wxPropertyContract.setPrice(record.getPrice());
wxPropertyContract.setDeposit(record.getDeposit());
wxPropertyContract.setReceivePeriod(record.getReceivePeriod());
wxPropertyContract.setPayAccount(record.getPayAccount());
List<WxBillProperty> billList = buildProperty(new WxMerchant(),userId,wxPropertyContract,EnumIsPreview.YES.getCode());
record.setPreviewBillRentList(billList);
}else{
//查询预账单用于展示
WxBillProperty wxBillRent = new WxBillProperty();
wxBillRent.setPropertyContractId(record.getId());
wxBillRent.setSortColumns(WxBillProperty.Field.Period_ASC);
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
List<WxBillProperty> billList = wxBillPropertyMapper.findList(wxBillRent);
billList = buildProperty(new WxMerchant(),userId,wxPropertyContract,EnumIsPreview.YES.getCode());
record.setPreviewBillRentList(billList);
}
message = "更新物业合同信息成功";


+ 13
- 11
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -249,8 +249,18 @@ public class WxRentContractServiceImpl implements WxRentContractService {
public ResultData update(WxRentContract record, Long userId,String userName) {
//对比上一次,是否有更改,有,重新生成预账单
WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(record.getId());

//查询预账单用于展示
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setRentContractId(record.getId());
wxBillRent.setSortColumns(WxBillRent.Field.Period_ASC);
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
List<WxBillRent> resultList = wxBillRentMapper.findList(wxBillRent);

boolean change = false;
if(record.getAdjustPeriod().intValue() != dbRent.getAdjustPeriod().intValue()){
if(CollectionUtils.isEmpty(resultList)){
change = true;
}else if(record.getAdjustPeriod().intValue() != dbRent.getAdjustPeriod().intValue()){
change = true;
}else{
if(record.getReceivePeriod() != null && record.getLease()!=null && record.getPrice()!= null) {
@@ -289,17 +299,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
ResultData resultData = getResultDataForUpdate(record, userId);

//有改变,删除预账单,重新生成
List<WxBillRent> resultList;
if(change) {
wxBillRentMapper.deletePreviewBill(record);
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode());
}else{
//查询预账单用于展示
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setRentContractId(record.getId());
wxBillRent.setSortColumns(WxBillRent.Field.Period_ASC);
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
resultList = wxBillRentMapper.findList(wxBillRent);
}

//启动审批流
@@ -320,8 +322,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {

// 保存调整金额(预账单调整)
if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){
for (WxBillRent wxBillRent:record.getPreviewBillRentList()) {
wxBillRentMapper.update(wxBillRent);
for (WxBillRent billRent:record.getPreviewBillRentList()) {
wxBillRentMapper.update(billRent);
}
}
WxRentContract wxRentContract = (WxRentContract)resultData.data;


Loading…
Cancel
Save