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

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

release
release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
e6704238e0
5 измененных файлов: 19 добавлений и 15 удалений
  1. +7
    -7
      mallinkAdmin/src/main/resources/application-dev.yml
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java
  3. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  4. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 7
- 7
mallinkAdmin/src/main/resources/application-dev.yml Просмотреть файл

@@ -3,9 +3,9 @@ spring:
include: rabbitMQ
# 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: root
password: root
url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
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: 127.0.0.1
host: 202.165.179.86
port: 6379
password: test123
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
timeout: 3600
expire: 1800 #30分钟
database: 1
@@ -92,9 +92,9 @@ wechat:
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
redis:
host: 127.0.0.1
host: 202.165.179.86
port: 6379
password:
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
timeout: 3600
expire: 1800 #30分钟
database: 2


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java Просмотреть файл

@@ -22,7 +22,7 @@ public interface WxOrderMapper extends CommonMapper<WxOrder, Long> {
List<WxOrder> findListOfCompleteUnPaidPressOrderByDate(Map dateMap);

List<WxOrderCouponVo> findListOfCUser(WxOrder wxOrder);
WxOrderCouponVo selectDetailOfCUser(WxOrder wxOrder);
List<WxOrderCouponVo> selectDetailOfCUser(WxOrder wxOrder);

Map dayMicroPayAmountList(Map dateMap);
List<WxOrderPayVo> findListOfMicroPayOrderByDate(Map dateMap);


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

@@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -299,13 +300,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
if (!c.getMerchantId().equals(0L)) {
List<WxMerchantVo> merchantVoList = c.getMerchantVoList();
if (!merchantVoList.isEmpty()) {
StringBuffer shopNumber = new StringBuffer();
StringBuffer building = new StringBuffer();
if (!CollectionUtils.isEmpty(merchantVoList)) {
StringBuilder shopNumber = new StringBuilder();
StringBuilder building = new StringBuilder();
WxMerchantVo wxMerchantVo = merchantVoList.get(0);
List<WxShopVo> shopVoList = wxMerchantVo.getShopVoList();
for (int j = 0, s_size = shopVoList.size(); j < s_size; j++) {
WxShopVo wxShopVo = shopVoList.get(j);
for (WxShopVo wxShopVo : shopVoList) {
shopNumber.append(wxShopVo.getShopNumber()).append(";");
building.append(wxShopVo.getBuildingName()).append(wxShopVo.getFloorName()).append(";");
}


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

@@ -1394,7 +1394,11 @@ public class WxOrderServiceImpl implements WxOrderService {

@Override
public WxOrderCouponVo detailCUserVo(WxOrder record) {
return wxOrderMapper.selectDetailOfCUser(record);
List<WxOrderCouponVo> list = wxOrderMapper.selectDetailOfCUser(record);
if (list.size() > 0) {
return list.get(0);
}
return null;
}

@Override


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

@@ -310,7 +310,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
.stream().filter(p -> p.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) ||
p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) ||
p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count();
if (count > 0) {
if (count > 1) {
return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND);
}
//保存物业合同信息


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