Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -12,16 +12,14 @@ import com.gree.mall.manager.bean.policy.PolicyVo;
 import com.gree.mall.manager.commonmapper.PolicyCMapper;
 import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.plus.entity.PolicyOrder;
-import com.gree.mall.manager.plus.entity.WebsitUser;
-import com.gree.mall.manager.plus.entity.WorkerPolicy;
+import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.AdminWebsitService;
 import com.gree.mall.manager.plus.service.PolicyOrderService;
 import com.gree.mall.manager.plus.service.WebsitUserService;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.remoting.RemoteAccessException;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -109,6 +107,9 @@ public class PolicyOrderLogic {
                     .eq(PolicyOrder::getType, "IN")
                     .eq(PolicyOrder::getPolicyOrderStatus, "DGM").one();
 
+            if (policyOrder == null)
+                throw new RemoteAccessException((String) row.get(1)+"网点下工程师未找到"+(String) row.get(3));
+
 
             if (policyOrder != null) {
                 WorkerPolicy workerPolicy = new WorkerPolicy();

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

@@ -121,4 +121,26 @@ 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-test.gree.com/api/sso/sms-server-order-external
+
+
+gree.url=https://api.sms-test.gree.com/api/sso/sms-server-order-external
+
+
+#总部3.0接口地址
+gree.V3.url=https://api-sms.gree.com
+gree.V3.gettoken=https://idm-sms.gree.com/auth/realms/gree-shyun/protocol/openid-connect/token
+gree.client.id=guangfoserver
+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
+gree.repair.settle.do=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/repairsettlement/gzBatchSettlement
+#总部接口地址
+gree.api.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou/api/outapp/default/general
+gree.web.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou
+gree.grant_type=client_credentials
+gree.gz.appid=O921980101
+gree.gz.appkey=4Bx3m3fOMatutVv1u08kUdtIYZ4FsN4x
+gree.fs.appid=O921980101
+gree.fs.appkey=4Bx3m3fOMatutVv1u08kUdtIYZ4FsN4x

mall-server-api/src/main/resources/bootstrap-test.properties

@@ -117,4 +117,26 @@ fadada.websit.auth.verified-way=3
 fadada.websit.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/auth
 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-test.gree.com/api/sso/sms-server-order-external
+
+
+gree.url=https://api.sms-test.gree.com/api/sso/sms-server-order-external
+
+
+#总部3.0接口地址
+gree.V3.url=https://api-sms.gree.com
+gree.V3.gettoken=https://idm-sms.gree.com/auth/realms/gree-shyun/protocol/openid-connect/token
+gree.client.id=guangfoserver
+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
+gree.repair.settle.do=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/repairsettlement/gzBatchSettlement
+#总部接口地址
+gree.api.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou/api/outapp/default/general
+gree.web.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou
+gree.grant_type=client_credentials
+gree.gz.appid=O921980101
+gree.gz.appkey=4Bx3m3fOMatutVv1u08kUdtIYZ4FsN4x
+gree.fs.appid=O921980101
+gree.fs.appkey=4Bx3m3fOMatutVv1u08kUdtIYZ4FsN4x