diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 74fcc21dd..80e467d64 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -4,8 +4,8 @@ spring: # JDBC datasource: 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 driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -26,9 +26,9 @@ spring: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 202.165.179.86 + host: 127.0.0.1 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: test123 timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -73,7 +73,7 @@ spring: publisher-returns: false virtual-host: / flyway: - enabled: true + enabled: false aws: clientRegion: cn-northwest-1 @@ -92,9 +92,9 @@ wechat: componentToken: "formall2018" componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" redis: - host: 202.165.179.86 + host: 127.0.0.1 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: timeout: 3600 expire: 1800 #30分钟 database: 2 diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java index b8d17977e..8031e0965 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java +++ b/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") private String ticketNumber; + @io.swagger.annotations.ApiModelProperty(value = "兑换用途", name = "changePurpose") + private String changePurpose; + } 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 277375b51..8993f7b82 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1760,10 +1760,16 @@ public class WxRentContractServiceImpl implements WxRentContractService { public void updatePropertyPreviewBill(WxRentContract record) { //合并合同-更新物业账单 if (record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())) { + //查签约 WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setRentContractId(record.getId()); wxPropertyContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContract)); + //查补录 + if(propertyContract==null){ + wxPropertyContract.setStatus(EnumRentContractStatus.SUPPLE.getCode()); + propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContract)); + } if (propertyContract != null) { propertyContract.setMerchantId(record.getMerchantId()); wxPropertyContractMapper.updateById(propertyContract); diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index a4f5210fa..8aad4a76d 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/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) 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) - else '' end operator + else '' end operator, + credit.change_purpose changePurpose FROM wx_c_user_basic_info basic INNER JOIN wx_credit_history credit ON basic.id = credit.c_user_id