diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java
index 046ea31d0..3953aa490 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java
@@ -92,6 +92,7 @@ public class WxMsgController extends BaseController {
if(wxMsg.getId()!=null){
//如果不是草稿必然之前状态是草稿,删除
wxMsgService.deleteById(wxMsg.getId());
+ wxMsg.setId(null);
}
}
diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java
index 847ba48f9..6c2efa9c2 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java
@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
index 01e8ebdf4..541819f43 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
@@ -183,6 +183,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
// 8. 补贴
// 补贴额 = 商城补贴总额/卡券面额 * 抵扣额(本次支付额)
Integer subsidyFee = record.getDeductionAmount() * coupon.getSubsidyNum() / cardInfo.getAmount();
+ logger.info("补贴额: " + subsidyFee);
if(subsidyFee > 0) {
// 有补贴时入库
Double dSubChargeFee = Math.ceil(subsidyFee * 1.0D * payAccount.getRate() / 10000);
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
index 851674853..0dd477074 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
@@ -1,9 +1,7 @@
package com.iformall.service.impl;
-import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
@@ -13,15 +11,12 @@ import com.iformall.mapper.*;
import com.iformall.mq.MqBaseProducer;
import com.iformall.service.WxCUserTagsService;
import com.iformall.service.WxMsgService;
-import com.iformall.utils.DateUtils;
-import com.iformall.utils.WiwideUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-
import java.util.*;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
index b1dc1e93d..98c5c3ade 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
@@ -273,7 +273,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
//生成预览账单
if(!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod())
||!wxPropertyContract.getPrice().equals(record.getPrice())
- ||!wxPropertyContract.getDeposit().equals(record.getDeposit())){
+ ||!wxPropertyContract.getDeposit().equals(record.getDeposit())
+ ||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod())){
wxBillPropertyMapper.deletePreviewBill(record);
//重新生成
wxPropertyContract.setPrice(record.getPrice());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
index 544ccf628..74231fbec 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
@@ -250,36 +250,41 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//对比上一次,是否有更改,有,重新生成预账单
WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(record.getId());
boolean change = false;
- if(record.getReceivePeriod() != null && record.getLease()!=null && record.getPrice()!= null) {
- if (record.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())) {
- if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
- || !record.getLease().equals(dbRent.getLease())
- || !record.getType().equals(dbRent.getType())
- || !record.getPrice().equals(dbRent.getPrice())
- || !record.getAdjustRatio().replaceAll("\\s*","").equals(dbRent.getAdjustRatio().replaceAll("\\s*",""))
- ) {
- change = true;
- }
- } else if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
- if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
- || !record.getLease().equals(dbRent.getLease())
- || !record.getType().equals(dbRent.getType())
- || !record.getRevenue().equals(dbRent.getRevenue())
- || !record.getPayRatio().equals(dbRent.getPayRatio())
- ) {
- change = true;
- }
- } else if (record.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())) {
- if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
- || !record.getLease().equals(dbRent.getLease())
- || !record.getType().equals(dbRent.getType())
- || !record.getPrice().equals(dbRent.getPrice())
- || !record.getPayRatio().equals(dbRent.getPayRatio())
- ) {
- change = true;
+ if(record.getAdjustPeriod().intValue() != dbRent.getAdjustPeriod().intValue()){
+ change = true;
+ }else{
+ if(record.getReceivePeriod() != null && record.getLease()!=null && record.getPrice()!= null) {
+ if (record.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())) {
+ if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
+ || !record.getLease().equals(dbRent.getLease())
+ || !record.getType().equals(dbRent.getType())
+ || !record.getPrice().equals(dbRent.getPrice())
+ || !record.getAdjustRatio().replaceAll("\\s*","").equals(dbRent.getAdjustRatio().replaceAll("\\s*",""))
+ ) {
+ change = true;
+ }
+ } else if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
+ if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
+ || !record.getLease().equals(dbRent.getLease())
+ || !record.getType().equals(dbRent.getType())
+ || !record.getRevenue().equals(dbRent.getRevenue())
+ || !record.getPayRatio().equals(dbRent.getPayRatio())
+ ) {
+ change = true;
+ }
+ } else if (record.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())) {
+ if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
+ || !record.getLease().equals(dbRent.getLease())
+ || !record.getType().equals(dbRent.getType())
+ || !record.getPrice().equals(dbRent.getPrice())
+ || !record.getPayRatio().equals(dbRent.getPayRatio())
+ ) {
+ change = true;
+ }
}
}
}
+
// 更新
ResultData resultData = getResultDataForUpdate(record, userId);
diff --git a/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml
index ec6329cb5..ce76a0d66 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml
@@ -28,7 +28,7 @@
- id,tenant_id,domain,msg_type,msg,send_time,model_id,sender,sender_user_id,sender_user_name,receiver,receiver_user_id,
+ id,tenant_id,`domain`,msg_type,msg,send_time,model_id,sender,sender_user_id,sender_user_name,receiver,receiver_user_id,
receiver_user_name,msg_status,status_message,createtime,updatetime,uuid,signature,model_type,msg_json
@@ -54,12 +54,6 @@
and `domain` = #{domain}
-
- and id in
-
- #{idItem}
-
-
order by createtime desc
diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml
index 7b962fa60..ab7ebc0f2 100644
--- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml
@@ -417,7 +417,7 @@
and s.id not in(
- SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status not in(0,1,5,6,7) and
+ SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status not in(0,5,6,7) and
merchant_id is not null
)