Merge branch 'api' of http://120.27.238.55:7000/r/beauty-erp into api

Helius

2021-03-17 19aea3255126baa2387d4205747cdddff3e8d183

Merge branch 'api' of http://120.27.238.55:7000/r/beauty-erp into api

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java

@@ -326,7 +326,7 @@

                }
            } else if ("赠送".equals(sysProjUse.getSource())) {
                if (orderItem!=null &&orderItem.getArrears() > 0) {
                if (orderItem!=null && orderItem.getArrears()!=null&&orderItem.getArrears() > 0) {
                    return new VerifyResult(true, shoppingGoods.getName() + "存在欠款" + orderItem.getArrears() + "元 , 不能消费赠送项目，订单编号[ " + sysOrderService.findById(orderItem.getOrderId()).getOrderNo() + " ] ");
                }
            }

 zq-erp/src/main/resources/config/dev/system.properties

@@ -19,11 +19,11 @@
maxUploadSize=10485760

#Matser\u7684ip\u5730\u5740
redis.hostname=118.31.227.147
redis.hostname=120.27.238.55
#\u7AEF\u53E3\u53F7
redis.port=6379
#\u5982\u679C\u6709\u5BC6\u7801
redis.password=123456
redis.password=xcong123
#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
redis.timeout=10000
redis.database=7

 zq-erp/src/main/resources/config/prd/application.properties

@@ -42,7 +42,7 @@


#rabbitMQ配置
rabbitmq.host=127.0.0.1
rabbitmq.host=47.111.134.136
rabbitmq.port=5672
rabbitmq.username=hivequeue
rabbitmq.password=hivequeueadmin

 zq-erp/src/main/resources/config/prd/system.properties

@@ -19,11 +19,11 @@
maxUploadSize=10485760

#Matser\u7684ip\u5730\u5740
redis.hostname=118.31.227.147
redis.hostname=120.27.238.55
#\u7AEF\u53E3\u53F7
redis.port=6379
#\u5982\u679C\u6709\u5BC6\u7801
redis.password=123456
redis.password=xcong123
#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
redis.timeout=10000  
redis.database=1

 zq-erp/src/main/resources/config/system.properties

@@ -22,11 +22,11 @@
maxUploadSize=10485760

#Matser\u7684ip\u5730\u5740
redis.hostname=118.31.227.147
redis.hostname=120.27.238.55
#\u7AEF\u53E3\u53F7
redis.port=6379
#\u5982\u679C\u6709\u5BC6\u7801
redis.password=123456
redis.password=xcong123
#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
redis.timeout=10000  
redis.database=1

 zq-erp/src/main/resources/config/test/system.properties

@@ -20,11 +20,11 @@


#Matser\u7684ip\u5730\u5740
redis.hostname=118.31.227.147
redis.hostname=120.27.238.55
#\u7AEF\u53E3\u53F7
redis.port=6379
#\u5982\u679C\u6709\u5BC6\u7801
redis.password=123456
redis.password=xcong123
#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
redis.timeout=10000  
redis.database=1

 zq-erp/src/main/resources/config/xcx/system.properties

@@ -20,11 +20,11 @@


#Matser\u7684ip\u5730\u5740
redis.hostname=118.31.227.147
redis.hostname=120.27.238.55
#\u7AEF\u53E3\u53F7
redis.port=6379
#\u5982\u679C\u6709\u5BC6\u7801
redis.password=123456
redis.password=xcong123
#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
redis.timeout=10000  
redis.database=1