一些优化

conf/application-ddWebOne.xml

@@ -274,7 +274,7 @@
                 <isUseScriptService value="true"/>
             </service>
 
-            <service value="com.dderp.business.service.flycat.DouyinServiceImpl" groups="DELIVER_SERVICE_REMOTE">
+            <service value="com.dderp.business.service.flycat.IncomePlatformServiceImpl" groups="DELIVER_SERVICE_REMOTE">
                 <master value="true"/>
                 <environment value="release"/>
                 <isUseScriptService value="false"/>

conf/script/1000/orderApi/BE_Order_AcceptOrder_DYLK.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -67,7 +67,7 @@ class BE_Order_AcceptOrder_DYLK implements BusinessExecutor<InvokeCallParams, In
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService

conf/script/1000/orderApi/BE_Order_AcceptOrder_Request.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -55,7 +55,7 @@ class BE_Order_AcceptOrder_Request implements BusinessExecutor<InvokeCallParams,
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService
@@ -103,7 +103,7 @@ class BE_Order_AcceptOrder_Request implements BusinessExecutor<InvokeCallParams,
                         order_id:
                                 esOrder.incomePlatformOrderCode
                 ]
-                String responseStr = douyinService.postInvoker("/goodlife/v1/trade/buy/merchant_confirm_order/", jsonConvert.convertTo(postBody))
+                String responseStr = douyinService.dyPostInvoker("/goodlife/v1/trade/buy/merchant_confirm_order/", jsonConvert.convertTo(postBody))
                 def response = jsonSlurper.parseText(responseStr)
                 if (response["data"]["error_code"] as Integer == 0) {
                     return RetResult.<InvokeCallResult> successT()

conf/script/1000/orderApi/BE_Order_BillConfirm_DYLK.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -13,7 +13,6 @@ import com.dderp.common.datas.flycat.PlatformType
 import com.dderp.common.entity.base.InvokeCallParams
 import com.dderp.common.entity.base.InvokeCallResult
 import com.dderp.common.entity.order.BusinessOrder
-import com.dderp.common.entity.order.OrderAfterSaleBill
 import com.dderp.common.entity.order.OrderFinances
 import com.dderp.common.entity.order.OrderStep
 import com.dderp.common.entity.site.ERPTokenUser
@@ -36,7 +35,6 @@ import org.elasticsearch.common.xcontent.XContentType
 import org.rex.RMap
 
 import javax.annotation.Resource
-import java.math.RoundingMode
 import java.time.LocalDateTime
 import java.time.ZoneOffset
 
@@ -72,7 +70,7 @@ class BE_Order_BillConfirm_DYLK implements BusinessExecutor<InvokeCallParams, In
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService

conf/script/1000/orderApi/BE_Order_CancelOrder_DYLK.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -71,7 +71,7 @@ class BE_Order_CancelOrder_DYLK implements BusinessExecutor<InvokeCallParams, In
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource(name = "APP_HOME")
     private String appHome

conf/script/1000/orderApi/BE_Order_CompleteOrder_DYLK.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -68,7 +68,7 @@ class BE_Order_CompleteOrder_DYLK implements BusinessExecutor<InvokeCallParams,
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService

conf/script/1000/orderApi/BE_Order_CookingDone_Request.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -55,7 +55,7 @@ class BE_Order_CookingDone_Request implements BusinessExecutor<InvokeCallParams,
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService
@@ -103,7 +103,7 @@ class BE_Order_CookingDone_Request implements BusinessExecutor<InvokeCallParams,
                         order_id:
                                 esOrder.incomePlatformOrderCode
                 ]
-                String responseStr = douyinService.postInvoker("/goodlife/v1/hermes/preparation/complete/confirm/", jsonConvert.convertTo(postBody))
+                String responseStr = douyinService.dyPostInvoker("/goodlife/v1/hermes/preparation/complete/confirm/", jsonConvert.convertTo(postBody))
                 def response = jsonSlurper.parseText(responseStr)
                 if (response["data"]["error_code"] as Integer == 0) {
                     return RetResult.<InvokeCallResult> successT()

conf/script/1000/orderApi/BE_Order_DeliveryChange_DYLK.groovy

@@ -2,14 +2,13 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
 import com.dderp.common.datas.ERPModule
 import com.dderp.common.datas.ESKeys
 import com.dderp.common.datas.ReadOrderOption
-import com.dderp.common.datas.flycat.BusinessOrderStatus
 import com.dderp.common.datas.flycat.PlatformType
 import com.dderp.common.entity.base.InvokeCallParams
 import com.dderp.common.entity.base.InvokeCallResult
@@ -72,7 +71,7 @@ class BE_Order_DeliveryChange_DYLK implements BusinessExecutor<InvokeCallParams,
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService
@@ -131,7 +130,7 @@ class BE_Order_DeliveryChange_DYLK implements BusinessExecutor<InvokeCallParams,
                 order_id  : incomePlatformOrderCode,
                 account_id: platformAccountId
         ]
-        String responseStr = douyinService.getInvoker("/goodlife/v1/hermes/trade/order/query/", jsonConvert.convertTo(postBody))
+        String responseStr = douyinService.dyGetInvoker("/goodlife/v1/hermes/trade/order/query/", jsonConvert.convertTo(postBody))
         def response = jsonSlurper.parseText(responseStr)
 
         StringBuilder sb = new StringBuilder()

conf/script/1000/orderApi/BE_Order_PartRefund_DYLK.groovy

@@ -2,7 +2,8 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -74,7 +75,7 @@ class BE_Order_PartRefund_DYLK implements BusinessExecutor<InvokeCallParams, Inv
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService

conf/script/1000/orderApi/BE_Order_ProcessRefund_DYLK.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -12,13 +12,11 @@ import com.dderp.common.datas.flycat.PlatformType
 import com.dderp.common.datas.flycat.RefundRequestStatus
 import com.dderp.common.entity.base.InvokeCallParams
 import com.dderp.common.entity.base.InvokeCallResult
-import com.dderp.common.entity.order.BusinessOrder
 import com.dderp.common.entity.order.OrderAfterSaleBill
 import com.dderp.common.entity.order.OrderRefundRequest
 import com.dderp.common.entity.order.OrderStep
 import com.dderp.common.entity.site.ERPTokenUser
 import com.dderp.common.entity.store.StorePlatform
-import com.dderp.common.tool.ERPUtils
 import com.dySweetFishPlugin.elasticsearch.ESClient
 import com.dySweetFishPlugin.sql.TableIdService
 import com.dySweetFishPlugin.sql.dao.TunaService
@@ -71,7 +69,7 @@ class BE_Order_ProcessRefund_DYLK implements BusinessExecutor<InvokeCallParams,
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService

conf/script/1000/orderApi/BE_Order_ProcessRefund_Request.groovy

@@ -2,19 +2,15 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
 import com.dderp.common.datas.ERPModule
-import com.dderp.common.datas.flycat.RefundRequestStatus
 import com.dderp.common.entity.base.InvokeCallParams
 import com.dderp.common.entity.base.InvokeCallResult
-import com.dderp.common.entity.order.BusinessOrder
-import com.dderp.common.entity.order.OrderAfterSaleBill
 import com.dderp.common.entity.order.OrderRefundRequest
 import com.dderp.common.entity.site.ERPTokenUser
-import com.dderp.common.entity.store.StorePlatform
 import com.dderp.common.tool.ERPUtils
 import com.dySweetFishPlugin.elasticsearch.ESClient
 import com.dySweetFishPlugin.sql.TableIdService
@@ -60,7 +56,7 @@ class BE_Order_ProcessRefund_Request implements BusinessExecutor<InvokeCallParam
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService
@@ -159,7 +155,7 @@ class BE_Order_ProcessRefund_Request implements BusinessExecutor<InvokeCallParam
                         }
                 ]
 
-                String responseStr = douyinService.postInvoker("/goodlife/v1/after_sale/audit/notify/", jsonConvert.convertTo(postBody))
+                String responseStr = douyinService.dyPostInvoker("/goodlife/v1/after_sale/audit/notify/", jsonConvert.convertTo(postBody))
                 def response = jsonSlurper.parseText(responseStr)
                 if (response["extra"]["error_code"] as Integer == 0) {
                     return RetResult.<InvokeCallResult> successT()

conf/script/1000/orderApi/BE_Order_RejectOrder_DYLK.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -72,7 +72,7 @@ class BE_Order_RejectOrder_DYLK implements BusinessExecutor<InvokeCallParams, In
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService

conf/script/1000/orderApi/BE_Order_RejectOrder_Request.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -56,7 +56,7 @@ class BE_Order_RejectOrder_Request implements BusinessExecutor<InvokeCallParams,
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService
@@ -106,7 +106,7 @@ class BE_Order_RejectOrder_Request implements BusinessExecutor<InvokeCallParams,
                                 desc       : invokeOrder["description"]
                         ]
                 ]
-                String responseStr = douyinService.postInvoker("/goodlife/v1/after_sale/order/merchant_reject/", jsonConvert.convertTo(postBody))
+                String responseStr = douyinService.dyPostInvoker("/goodlife/v1/after_sale/order/merchant_reject/", jsonConvert.convertTo(postBody))
                 def response = jsonSlurper.parseText(responseStr)
                 if (response["extra"]["error_code"] as Integer == 0) {
                     return RetResult.<InvokeCallResult> successT()

conf/script/1000/orderApi/BE_Order_StoreCancelOrder_Request.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -56,7 +56,7 @@ class BE_Order_StoreCancelOrder_Request implements BusinessExecutor<InvokeCallPa
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource(name = "APP_HOME")
     private String appHome
@@ -132,7 +132,7 @@ class BE_Order_StoreCancelOrder_Request implements BusinessExecutor<InvokeCallPa
                                 desc       : invokeOrder["description"]
                         ]
                 ]
-                String responseStr = douyinService.postInvoker("/goodlife/v1/after_sale/order/apply_refund/", jsonConvert.convertTo(postBody))
+                String responseStr = douyinService.dyPostInvoker("/goodlife/v1/after_sale/order/apply_refund/", jsonConvert.convertTo(postBody))
                 def response = jsonSlurper.parseText(responseStr)
                 if (response["extra"]["error_code"] as Integer == 0) {
                     return RetResult.<InvokeCallResult>successT()

conf/script/1000/orderApi/BE_Order_SubmitDeliveryInfo_DYLK.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -55,7 +55,7 @@ class BE_Order_SubmitDeliveryInfo_DYLK implements BusinessExecutor<InvokeCallPar
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService
@@ -124,7 +124,7 @@ class BE_Order_SubmitDeliveryInfo_DYLK implements BusinessExecutor<InvokeCallPar
                 rider_phone_type : invokeOrder["rider_phone_type"] as int,
                 three_delivery_id: invokeOrder["three_delivery_id"] as String
         ]
-        String responseStr = douyinService.postInvoker("/goodlife/v1/fulfilment/distribution/order/sync_status/", jsonConvert.convertTo(postBody))
+        String responseStr = douyinService.dyPostInvoker("/goodlife/v1/fulfilment/distribution/order/sync_status/", jsonConvert.convertTo(postBody))
         def response = jsonSlurper.parseText(responseStr)
         if (response["extra"]["error_code"] as Integer == 0) {
             return RetResult.<InvokeCallResult> successT()

conf/script/1000/orderApi/BE_Order_UserRefundRequest_DYLK.groovy

@@ -2,7 +2,7 @@ import com.dderp.business.dao.OrderDao
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.api.flycat.OrderSearchService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
@@ -70,7 +70,7 @@ class BE_Order_UserRefundRequest_DYLK implements BusinessExecutor<InvokeCallPara
     private OrderSearchService orderSearchService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private TunaService tunaService

conf/script/1000/storeApi/BE_Store_BindStorePlatform_DYLK.groovy

@@ -3,11 +3,10 @@ import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.NoSqlKeysService
 import com.dderp.common.api.PlatformService
 import com.dderp.common.api.StoreService
-import com.dderp.common.api.flycat.DouyinService
+import com.dderp.common.api.flycat.IncomePlatformService
 import com.dderp.common.datas.ERPModule
 import com.dderp.common.datas.ESKeys
 import com.dderp.common.datas.flycat.PlatformType
-import com.dderp.common.entity.base.InvokeCallResult
 import com.dderp.common.entity.base.ProcessStringItem
 import com.dderp.common.entity.platform.PlatformInfo
 import com.dderp.common.entity.site.ERPTokenUser
@@ -51,7 +50,7 @@ class BE_Store_BindStorePlatform_DYLK implements BusinessExecutor<ProcessStringI
     private PlatformService platformService
 
     @Resource
-    private DouyinService douyinService
+    private IncomePlatformService douyinService
 
     @Resource
     private ESClient esClient
@@ -153,71 +152,15 @@ class BE_Store_BindStorePlatform_DYLK implements BusinessExecutor<ProcessStringI
             def postBody = [
                     poi_id: invokeContent["poi_id"] as String
             ]
-            String responseStr = douyinService.getInvoker("/goodlife/v1/shop/poi/query/", jsonConvert.convertTo(postBody))
+            String responseStr = douyinService.dyGetInvoker("/goodlife/v1/shop/poi/query/", jsonConvert.convertTo(postBody))
             def response = jsonSlurper.parseText(responseStr)
             if (response["extra"]["error_code"] as Integer == 0) {
                 def poi = (response["pois"] as ArrayList).get(0)
-                //固定5个参数
-                //平台门店名称 platformShopName
-//                平台门店坐标 platformShopGeoLat
-//                平台门店坐标 platformShopGeoLng
-//                地址：platformShopAddress
-//                电话：platformShopPhone
-                long requireId = tableIdService.getTableIdMulti("tbStorePlatformRequire.id", 5, dataSourceId, String.valueOf(supplierCode))
-                StorePlatformRequire require = new StorePlatformRequire()
-                require.setId(requireId)
-                require.setIdStore(storeInfo.id)
-                require.setIdStorePlatform(storePlatform.id)
-                require.setPlatformRequireCode("platformShopName")
-                require.setPlatformRequireName("平台门店名称")
-                require.setItemValue(poi["poi_name"] as String)
-                StorePlatformRequire.create(require, currentUser.id)
-                storePlatform.requireList.add(require)
-                requireId++
-
-                StorePlatformRequire require1 = new StorePlatformRequire()
-                require1.setId(requireId)
-                require1.setIdStore(storeInfo.id)
-                require1.setIdStorePlatform(storePlatform.id)
-                require1.setPlatformRequireCode("platformShopAddress")
-                require1.setPlatformRequireName("平台门店地址")
-                require1.setItemValue(poi["address"] as String)
-                StorePlatformRequire.create(require1, currentUser.id)
-                storePlatform.requireList.add(require1)
-                requireId++
-
-                StorePlatformRequire require2 = new StorePlatformRequire()
-                require2.setId(requireId)
-                require2.setIdStore(storeInfo.id)
-                require2.setIdStorePlatform(storePlatform.id)
-                require2.setPlatformRequireCode("platformShopPhone")
-                require2.setPlatformRequireName("平台门店电话")
-                require2.setItemValue("") //抖音未提供
-                StorePlatformRequire.create(require2, currentUser.id)
-                storePlatform.requireList.add(require2)
-                requireId++
-
-                StorePlatformRequire require3 = new StorePlatformRequire()
-                require3.setId(requireId)
-                require3.setIdStore(storeInfo.id)
-                require3.setIdStorePlatform(storePlatform.id)
-                require3.setPlatformRequireCode("platformShopGeoLat")
-                require3.setPlatformRequireName("平台门店坐标Lat")
-                require3.setItemValue(poi["latitude"] as String)
-                StorePlatformRequire.create(require3, currentUser.id)
-                storePlatform.requireList.add(require3)
-                requireId++
-
-                StorePlatformRequire require4 = new StorePlatformRequire()
-                require4.setId(requireId)
-                require4.setIdStore(storeInfo.id)
-                require4.setIdStorePlatform(storePlatform.id)
-                require4.setPlatformRequireCode("platformShopGeoLng")
-                require4.setPlatformRequireName("平台门店坐标Lng")
-                require4.setItemValue(poi["longitude"] as String)
-                StorePlatformRequire.create(require4, currentUser.id)
-                storePlatform.requireList.add(require4)
 
+                storePlatform.platformShopName = poi["poi_name"] as String
+                storePlatform.platformShopAddress = poi["address"] as String
+                storePlatform.platformShopGeoLat = poi["latitude"] as String
+                storePlatform.platformShopGeoLng = poi["longitude"] as String
             } else {
                 //todo 抖音侧调用失败,怎么处理?
                 logger.error("[抖音来客]获取商户信息平台接口调用失败:" + response["extra"]["description"] as String)

conf/sqlroot/com/dderp/business/dao/StoreDao.dql

@@ -158,13 +158,17 @@ select *
 ;
 
 -- [addStorePlatform]
-insert into $table$ (id, idStore, platformStoreId, idPlatformInfo, platformName, platformCode,
-platformType, enableStatue, createBy,
-createTime, createTimeLong, updateBy,
-updateTime, updateTimeLong ) values ( #{id}, #{idstore}, #{platformstoreid}, #{idplatforminfo}, #{platformname}, #{platformcode},
-#{platformtype}, #{enablestatue}, #{createby},
-#{createtime}, #{createtimelong}, #{updateby},
-#{updatetime}, #{updatetimelong} );
+insert into $table$ (id, idStore, platformStoreId, idPlatformInfo,
+platformCode, platformName, platformType,
+enableStatue, platformShopName, platformShopAddress,
+platformShopPhone, platformShopGeoLat, platformShopGeoLng,
+createBy, createTime, createTimeLong,
+updateBy, updateTime, updateTimeLong ) values ( #{id}, #{idstore}, #{platformstoreid}, #{idplatforminfo},
+#{platformcode}, #{platformname}, #{platformtype},
+#{enablestatue}, #{platformshopname}, #{platformshopaddress},
+#{platformshopphone}, #{platformshopgeolat}, #{platformshopgeolng},
+#{createby}, #{createtime}, #{createtimelong},
+#{updateby}, #{updatetime}, #{updatetimelong} );
 
 -- [addStorePlatformRequire]
 insert into $table$ (id, idStore, idStorePlatform, idPlatformRequire,

conf/初始化业务表.sql

@@ -410,4 +410,12 @@ ALTER TABLE `deorderfinances1000_current`
     ADD COLUMN `customerRefunded` decimal(18, 4) NULL AFTER `customerPaid`;
 
 ALTER TABLE `deorderaftersalebill1000_current`
-    ADD COLUMN `refundReasonMsgs` varchar(500) NULL AFTER `refundReasonCodes`;
+    ADD COLUMN `refundReasonMsgs` varchar(500) NULL AFTER `refundReasonCodes`;
+
+
+ALTER TABLE `tbstoreplatform1000`
+    ADD COLUMN `platformShopName` varchar(200) NULL AFTER `enableStatue`,
+    ADD COLUMN `platformShopAddress` varchar(300) NULL AFTER `platformShopName`,
+    ADD COLUMN `platformShopPhone` varchar(20) NULL AFTER `platformShopAddress`,
+    ADD COLUMN `platformShopGeoLat` varchar(50) NULL AFTER `platformShopPhone`,
+    ADD COLUMN `platformShopGeoLng` varchar(50) NULL AFTER `platformShopGeoLat`;

ddBusiness/src/main/java/com/dderp/business/service/flycat/DouyinServiceImpl.java

@@ -1,20 +1,15 @@
 package com.dderp.business.service.flycat;
 
-import com.dderp.common.api.flycat.DouyinService;
+import com.dderp.common.api.flycat.IncomePlatformService;
 import com.dderp.common.base.BaseService;
-import com.dderp.common.datas.ERPModule;
 import com.dderp.common.datas.RedisKeys;
-import com.dderp.common.entity.base.ProcessStringItem;
 import com.dderp.common.entity.invoke.douyin.DouyinTokenRequest;
 import com.dderp.common.entity.invoke.douyin.DouyinTokenResponse;
-import com.dderp.common.entity.order.BusinessOrder;
-import com.dderp.common.entity.site.ERPTokenUser;
 import com.dderp.common.http.HttpTools;
 import com.dySweetFishPlugin.redis.RedisService;
 import com.dySweetFishPlugin.tool.lang.ThreadFactoryWithNamePrefix;
 import com.sweetfish.convert.json.JsonConvert;
 import com.sweetfish.service.Local;
-import com.sweetfish.service.RetResult;
 import com.sweetfish.util.AnyValue;
 import com.sweetfish.util.AutoLoad;
 import com.sweetfish.util.ResourceType;
@@ -29,26 +24,27 @@ import java.util.concurrent.*;
 
 @AutoLoad(false)
 @Local
-@ResourceType(DouyinService.class)
-public class DouyinServiceImpl extends BaseService implements DouyinService {
+@ResourceType(IncomePlatformService.class)
+public class IncomePlatformServiceImpl extends BaseService implements IncomePlatformService {
 
     @Resource
     private RedisService redisService;
 
-    private ScheduledThreadPoolExecutor accessTokenThread;
+    //抖音来客token线程池
+    private ScheduledThreadPoolExecutor dyAccessTokenThread;
     private String runEnvironment;
 
     @Resource
     private JsonConvert jsonConvert;
 
     @Resource(name = "property.douyin.appId")
-    private String appId;
+    private String dyAppId;
 
     @Resource(name = "property.douyin.appSecret")
-    private String appSecret;
+    private String dyAppSecret;
 
     @Resource(name = "property.douyin.reqUrl")
-    private String reqUrl;
+    private String dyReqUrl;
 
 
     @Override
@@ -69,11 +65,11 @@ public class DouyinServiceImpl extends BaseService implements DouyinService {
         if (master) {
             if (StringUtils.equalsIgnoreCase(runEnvironment, "dev")) {
                 //开发环境
-                accessTokenThread = null;
+                dyAccessTokenThread = null;
             } else {
                 //启动的时候10分钟之后获取，然后每隔1个半小时刷新一次token
                 //为什么10分钟，因为企点是每10分钟发送ticket，没有ticket的情况通过ticket是换不到开发商token的
-                accessTokenThread = new ScheduledThreadPoolExecutor(1,
+                dyAccessTokenThread = new ScheduledThreadPoolExecutor(1,
                         new ThreadFactoryWithNamePrefix("[抖音Access_Token线程池]"));
 
                 long tokenInitialDelay = 30;
@@ -91,7 +87,7 @@ public class DouyinServiceImpl extends BaseService implements DouyinService {
                     }
                 }
 
-                accessTokenThread.scheduleWithFixedDelay(() -> {
+                dyAccessTokenThread.scheduleWithFixedDelay(() -> {
                     scanRefreshToken();
                     //写入当前时间
                     redisService.set(RedisKeys.KEY_DOUYIN_LASTTOKENDATE, String.valueOf(Date.from(Instant.now()).getTime()));
@@ -102,8 +98,8 @@ public class DouyinServiceImpl extends BaseService implements DouyinService {
 
     @Override
     public void destroy(AnyValue config) {
-        if (accessTokenThread != null) {
-            accessTokenThread.shutdownNow();
+        if (dyAccessTokenThread != null) {
+            dyAccessTokenThread.shutdownNow();
         }
     }
 
@@ -111,7 +107,7 @@ public class DouyinServiceImpl extends BaseService implements DouyinService {
         DouyinTokenResponse dyToken = null;
         //抖音有可能获取不到token，这里循环获取，直到有值?
         do {
-            dyToken = this.requestAccessToken(appId, appSecret);
+            dyToken = this.requestAccessToken(dyAppId, dyAppSecret);
 
         } while ((dyToken == null) || (StringUtils.isEmpty(dyToken.getData().getAccess_token())));
 
@@ -128,7 +124,7 @@ public class DouyinServiceImpl extends BaseService implements DouyinService {
         header.put("Content-Type", "application/json");
 
         try {
-            String responseStr = HttpTools.postHttpContentAsync(reqUrl + "/oauth/client_token/", header,
+            String responseStr = HttpTools.postHttpContentAsync(dyReqUrl + "/oauth/client_token/", header,
                     jsonConvert.convertTo(tokenRequest)).get(5, TimeUnit.SECONDS);
 
             return jsonConvert.convertFrom(DouyinTokenResponse.class, responseStr);
@@ -150,14 +146,14 @@ public class DouyinServiceImpl extends BaseService implements DouyinService {
     }
 
     @Override
-    public String postInvoker(String subUrl, String body) {
+    public String dyPostInvoker(String subUrl, String body) {
         Map<String, String> header = new HashMap<>();
         header.put("access-token", getAccessToken());
         header.put("log_id", String.valueOf(new Date().getTime()));
         header.put("Content-Type", "application/json");
 
         try {
-            return HttpTools.postHttpContentAsync(reqUrl + subUrl, header, body).get(20, TimeUnit.SECONDS);
+            return HttpTools.postHttpContentAsync(dyReqUrl + subUrl, header, body).get(20, TimeUnit.SECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             logger.error("请求抖音来客接口[" + subUrl + "]失败", e);
             return null;
@@ -165,14 +161,14 @@ public class DouyinServiceImpl extends BaseService implements DouyinService {
     }
 
     @Override
-    public String getInvoker(String subUrl, String body) {
+    public String dyGetInvoker(String subUrl, String body) {
         Map<String, String> header = new HashMap<>();
         header.put("access-token", getAccessToken());
         header.put("log_id", String.valueOf(new Date().getTime()));
         header.put("Content-Type", "application/json");
 
         try {
-            return HttpTools.getHttpContentAsync(reqUrl + subUrl, header, body).get(20, TimeUnit.SECONDS);
+            return HttpTools.getHttpContentAsync(dyReqUrl + subUrl, header, body).get(20, TimeUnit.SECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             logger.error("请求抖音来客接口[" + subUrl + "]失败", e);
             return null;

ddCommon/src/main/java/com/dderp/common/api/flycat/DouyinService.java

@@ -1,13 +0,0 @@
-package com.dderp.common.api.flycat;
-
-import com.dderp.common.entity.order.BusinessOrder;
-import com.dderp.common.entity.site.ERPTokenUser;
-import com.sweetfish.service.RetResult;
-import com.sweetfish.service.Service;
-
-public interface DouyinService extends Service {
-    String postInvoker(String subUrl, String body);
-
-    String getInvoker(String subUrl, String body);
-
-}

ddCommon/src/main/java/com/dderp/common/api/flycat/IncomePlatformService.java

@@ -0,0 +1,10 @@
+package com.dderp.common.api.flycat;
+
+import com.sweetfish.service.Service;
+
+public interface IncomePlatformService extends Service {
+    String dyPostInvoker(String subUrl, String body);
+
+    String dyGetInvoker(String subUrl, String body);
+
+}

ddWebCore/src/main/java/com/dderp/webcore/servlet/OrderCallServlet.java

@@ -2,7 +2,7 @@ package com.dderp.webcore.servlet;
 
 import com.dderp.common.api.NoSqlKeysService;
 import com.dderp.common.api.StoreService;
-import com.dderp.common.api.flycat.DouyinService;
+import com.dderp.common.api.flycat.IncomePlatformService;
 import com.dderp.common.api.flycat.OrderService;
 import com.dderp.common.datas.ERPHeader;
 import com.dderp.common.datas.RedisKeys;
@@ -11,7 +11,6 @@ import com.dderp.common.entity.base.InvokeCallResult;
 import com.dderp.common.entity.invoke.douyin.DouyinCallBody;
 import com.dderp.common.entity.order.BusinessOrder;
 import com.dderp.common.entity.site.ERPTokenUser;
-import com.dderp.common.entity.store.StoreInfo;
 import com.dderp.common.entity.store.StorePlatform;
 import com.dderp.common.tool.DouyinTools;
 import com.dySweetFishPlugin.redis.RedisService;
@@ -49,7 +48,7 @@ public class OrderCallServlet extends HttpServlet {
     private NoSqlKeysService keysService;
 
     @Resource
-    private DouyinService douyinService;
+    private IncomePlatformService douyinService;
 
     @Resource
     private StoreService storeService;