Преглед изворни кода

合同及积分问题

release_toaliyun_real
gongbiao пре 6 година
родитељ
комит
5a4264e9a6
4 измењених фајлова са 18 додато и 8 уклоњено
  1. +7
    -7
      mallinkAdmin/src/main/resources/application-dev.yml
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java
  3. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +2
    -1
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml

+ 7
- 7
mallinkAdmin/src/main/resources/application-dev.yml Прегледај датотеку

@@ -4,8 +4,8 @@ spring:
# JDBC # JDBC
datasource: datasource:
url: jdbc:mysql://127.0.0.1:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true url: jdbc:mysql://127.0.0.1:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
username: root
password: root
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat filters: stat
@@ -26,9 +26,9 @@ spring:
#date-format: yyyy-MM-dd HH:mm:ss #date-format: yyyy-MM-dd HH:mm:ss
# REDIS # REDIS
redis: redis:
host: 202.165.179.86
host: 127.0.0.1
port: 6379 port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: test123
timeout: 3600 timeout: 3600
expire: 1800 #30分钟 expire: 1800 #30分钟
database: 1 database: 1
@@ -73,7 +73,7 @@ spring:
publisher-returns: false publisher-returns: false
virtual-host: / virtual-host: /
flyway: flyway:
enabled: true
enabled: false


aws: aws:
clientRegion: cn-northwest-1 clientRegion: cn-northwest-1
@@ -92,9 +92,9 @@ wechat:
componentToken: "formall2018" componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
redis: redis:
host: 202.165.179.86
host: 127.0.0.1
port: 6379 port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password:
timeout: 3600 timeout: 3600
expire: 1800 #30分钟 expire: 1800 #30分钟
database: 2 database: 2


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java Прегледај датотеку

@@ -72,4 +72,7 @@ public class WxCreditHistoryVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "小票号", name = "ticketNumber") @io.swagger.annotations.ApiModelProperty(value = "小票号", name = "ticketNumber")
private String ticketNumber; private String ticketNumber;


@io.swagger.annotations.ApiModelProperty(value = "兑换用途", name = "changePurpose")
private String changePurpose;

} }

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Прегледај датотеку

@@ -1760,10 +1760,16 @@ public class WxRentContractServiceImpl implements WxRentContractService {
public void updatePropertyPreviewBill(WxRentContract record) { public void updatePropertyPreviewBill(WxRentContract record) {
//合并合同-更新物业账单 //合并合同-更新物业账单
if (record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())) { if (record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())) {
//查签约
WxPropertyContract wxPropertyContract = new WxPropertyContract(); WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.setRentContractId(record.getId()); wxPropertyContract.setRentContractId(record.getId());
wxPropertyContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); wxPropertyContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode());
WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContract)); WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContract));
//查补录
if(propertyContract==null){
wxPropertyContract.setStatus(EnumRentContractStatus.SUPPLE.getCode());
propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContract));
}
if (propertyContract != null) { if (propertyContract != null) {
propertyContract.setMerchantId(record.getMerchantId()); propertyContract.setMerchantId(record.getMerchantId());
wxPropertyContractMapper.updateById(propertyContract); wxPropertyContractMapper.updateById(propertyContract);


+ 2
- 1
mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml Прегледај датотеку

@@ -154,7 +154,8 @@
case when credit.operator_type=4 then (select name from mall_user_info where id=credit.operator_id) case when credit.operator_type=4 then (select name from mall_user_info where id=credit.operator_id)
when credit.operator_type=3 then (select name from wx_merchant_b_user where id=credit.operator_id) when credit.operator_type=3 then (select name from wx_merchant_b_user where id=credit.operator_id)
when credit.operator_type=1 then (select nick_name from wx_c_user where id=credit.operator_id) when credit.operator_type=1 then (select nick_name from wx_c_user where id=credit.operator_id)
else '' end operator
else '' end operator,
credit.change_purpose changePurpose
FROM FROM
wx_c_user_basic_info basic wx_c_user_basic_info basic
INNER JOIN wx_credit_history credit ON basic.id = credit.c_user_id INNER JOIN wx_credit_history credit ON basic.id = credit.c_user_id


Loading…
Откажи
Сачувај