‘linchangsheng’ 5 months ago
parent
commit
b680b1aed2

+ 2 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -280,6 +280,8 @@ public class OrderBaseLogic {
             orderBase.setIsQd(false);
             if (orderBase.getIsImportExcel())
                 orderBase.setIsMeet(false);
+            else
+                orderBase.setIsMeet(true);
         }
 
         String orderTitle = getOrderTitle(orderAddBeanDTO.getOrderProducts());

+ 4 - 4
mall-server-api/src/main/resources/bootstrap-prd.properties

@@ -121,17 +121,17 @@ fadada.websit.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/noti
 fadada.websit.sign.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/batch/sign
 fadada.websit.person.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/person
 
-gree.url=https://api.sms-test.gree.com/api/sso/sms-server-order-external
+gree.url=https://api.sms.gree.com/api/sso/sms-server-order-external
 
 
-gree.four.url=http://api.sms-test.gree.com/api/sso/sms-server-order-external
+gree.four.url=http://api.sms.gree.com/api/sso/sms-server-order-external
 
 
 #总部3.0接口地址
 gree.V3.url=https://api-sms.gree.com
-gree.V3.gettoken=http://api.sms-test.gree.com/api/pub/nts-foundation-flycloud-user/api/v1/openid-connect/token
+gree.V3.gettoken=http://api.sms.gree.com/api/pub/nts-foundation-flycloud-user/api/v1/openid-connect/token
 gree.client.id=guangfoserver
-gree.V3.client.secert=f81f5ac8-ad24-4212-9b2d-9cc78f982562
+gree.V3.client.secert=3b23c33b-106d-4837-b506-7779335247d9
 gree.V3.api.url=${gree.V3.url}/api/sso/autoapp-default-server-greeshmobile/api/yunpaigong/accessories
 gree.check.barcode=${gree.V3.url}/api/sso/autoapp-default-server-installaccounts/api/ext/azwgmx/checkBarcode
 gree.repair.settle.get=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/JsBzController/xsGetJsbzByJxxmh