门店档案重构

conf/script/1000/expressApi/BE_Express_CreateOrder_SFTC.groovy

@@ -8,8 +8,8 @@ import com.dderp.common.datas.RedisKeys
 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.store.StoreInfo
 import com.dderp.common.entity.store.StorePlatformRequire
-import com.dderp.common.entity.store.ViewStoreInfo
 import com.dderp.common.http.HttpTools
 import com.dySweetFishPlugin.sql.dao.OperatorWait
 import com.sweetfish.convert.json.JsonConvert
@@ -124,14 +124,11 @@ class BE_Express_CreateOrder_SFTC implements BusinessExecutor<InvokeCallParams,
 
         BusinessOrder businessOrder = orderResult.result
 
-        ViewStoreInfo viewStoreInfo = storeService.getViewStoreInfo(businessOrder.idStore, source.supplierCode, false, false, true)
-        if (viewStoreInfo == null) {
+        StoreInfo storeInfo = storeService.getStoreInfo(businessOrder.idStore, source.supplierCode, false, false, true)
+        if (storeInfo == null) {
             return RetResult.<InvokeCallResult> errorT().retinfo("无效的门店信息")
         }
-        if (viewStoreInfo.storeInfo == null) {
-            return RetResult.<InvokeCallResult> errorT().retinfo("无效的门店信息")
-        }
-        StorePlatformRequire storePlatformRequire = viewStoreInfo.storeInfo.requireItem("SFTC", "shopId")
+        StorePlatformRequire storePlatformRequire = storeInfo.requireItem("SFTC", "shopId")
         if (storePlatformRequire == null) {
             return RetResult.<InvokeCallResult> errorT().retinfo("门店未设置顺丰店铺id")
         }

conf/script/1000/orderApi/BE_Order_CreateOrder_DYLK.groovy

@@ -4,22 +4,17 @@ import com.dderp.common.api.StoreService
 import com.dderp.common.api.SupplierInitService
 import com.dderp.common.api.flycat.OrderService
 import com.dderp.common.api.flycat.OrderStepService
-import com.dderp.common.datas.flycat.BusinessOrderStatus
 import com.dderp.common.datas.ERPModule
 import com.dderp.common.datas.ESKeys
+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
-import com.dderp.common.entity.base.ProcessStringItem
 import com.dderp.common.entity.geo.GeoPoiLocation
-import com.dderp.common.entity.order.BusinessOrder
-import com.dderp.common.entity.order.OrderDeliveryInfo
-import com.dderp.common.entity.order.OrderDetailItem
-import com.dderp.common.entity.order.OrderFinances
-import com.dderp.common.entity.order.OrderStep
+import com.dderp.common.entity.order.*
 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.entity.store.ViewStoreInfo
 import com.dySweetFishPlugin.elasticsearch.ESClient
 import com.dySweetFishPlugin.sql.TableIdService
 import com.dySweetFishPlugin.sql.dao.TunaService
@@ -107,9 +102,9 @@ class BE_Order_CreateOrder_DYLK implements BusinessExecutor<InvokeCallParams, In
         long suggestTimeLong = (invokeOrder["order"]["sys_expect_time"] as String).split("-")[0] as long
         businessOrder.setSuggestDeliverTimeLong(suggestTimeLong * 1000)
         businessOrder.setSuggestDeliverTime(new Date(businessOrder.suggestDeliverTimeLong))
-        ViewStoreInfo viewStoreInfo = storeService.getViewStoreInfo(storePlatform.idStore, supplierCode, false, false, false);
-        businessOrder.setIdStore(viewStoreInfo.storeInfo.id)
-        businessOrder.setStoreName(viewStoreInfo.storeInfo.storeName)
+        StoreInfo storeInfo = storeService.getStoreInfo(storePlatform.idStore, supplierCode, false, false, false);
+        businessOrder.setIdStore(storeInfo.id)
+        businessOrder.setStoreName(storeInfo.storeName)
         BigDecimal deliverFee = new BigDecimal((invokeOrder["amount_info"]["freight_pay_amount"] as int) / 100).setScale(2, RoundingMode.CEILING)
         businessOrder.setDeliverFee(deliverFee)
         String address = "[" + invokeOrder["receiver_info"]["city"] + "]" + invokeOrder["receiver_info"]["province"] +
@@ -171,7 +166,7 @@ class BE_Order_CreateOrder_DYLK implements BusinessExecutor<InvokeCallParams, In
 
         businessOrder.setDetailItemList(itemList)
 
-        OrderStep orderStep = orderStepService.parseOrderStep(businessOrder.id,  "[抖音来客]顾客完成付款下单", "DYLK", currentUser)
+        OrderStep orderStep = orderStepService.parseOrderStep(businessOrder.id, "[抖音来客]顾客完成付款下单", "DYLK", currentUser)
 
         //持久化
         //订单主表

conf/script/1000/storeApi/BE_Store_BindStorePlatform_Douyin.groovy

@@ -9,9 +9,9 @@ import com.dderp.common.datas.flycat.PlatformType
 import com.dderp.common.entity.base.ProcessStringItem
 import com.dderp.common.entity.platform.PlatformInfo
 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.entity.store.StorePlatformRequire
-import com.dderp.common.entity.store.ViewStoreInfo
 import com.dySweetFishPlugin.elasticsearch.ESClient
 import com.dySweetFishPlugin.sql.TableIdService
 import com.dySweetFishPlugin.sql.dao.TunaService
@@ -26,8 +26,6 @@ import org.elasticsearch.action.support.WriteRequest
 import org.elasticsearch.common.xcontent.XContentType
 
 import javax.annotation.Resource
-import java.time.LocalDateTime
-import java.time.ZoneOffset
 
 @SuppressWarnings("unused")
 class BE_Store_BindStorePlatform_Douyin implements BusinessExecutor<ProcessStringItem, StorePlatform> {
@@ -77,8 +75,8 @@ class BE_Store_BindStorePlatform_Douyin implements BusinessExecutor<ProcessStrin
         def invokeContent = jsonSlurper.parseText(source.itemValue)
 
         long idStore = invokeContent["out_shop_id"] as Long
-        ViewStoreInfo viewStoreInfo = storeService.getViewStoreInfo(idStore, supplierCode, false, false, false)
-        if (viewStoreInfo == null) return RetResult.<StorePlatform> errorT().retinfo("门店信息不存在")
+        StoreInfo storeInfo = storeService.getStoreInfo(idStore, supplierCode, false, false, false)
+        if (storeInfo == null) return RetResult.<StorePlatform> errorT().retinfo("门店信息不存在")
 
         PlatformInfo platformInfo = platformService.getPlatformInfoByCode("DYLK", true, supplierCode)
         if (platformInfo == null) return RetResult.<StorePlatform> errorT().retinfo("系统档案内未找到[抖音来客]平台")
@@ -108,7 +106,7 @@ class BE_Store_BindStorePlatform_Douyin implements BusinessExecutor<ProcessStrin
             platformInfo.requireList.each { require ->
                 StorePlatformRequire storePlatformRequire = new StorePlatformRequire()
                 storePlatformRequire.setId(requireId)
-                storePlatformRequire.setIdStore(viewStoreInfo.storeInfo.id)
+                storePlatformRequire.setIdStore(storeInfo.id)
                 storePlatformRequire.setIdPlatformRequire(require.id)
                 storePlatformRequire.setIdStorePlatform(storePlatform.id)
                 storePlatformRequire.setPlatformRequireCode(require.requireCode)

conf/script/1000/storeApi/BE_Store_GenerateStoreAuthUrl_Douyin.groovy

@@ -3,7 +3,7 @@ import com.dderp.common.api.StoreService
 import com.dderp.common.datas.ERPModule
 import com.dderp.common.entity.base.ProcessIdItem
 import com.dderp.common.entity.base.ScriptStringResult
-import com.dderp.common.entity.store.ViewStoreInfo
+import com.dderp.common.entity.store.StoreInfo
 import com.dderp.common.tool.DouyinTools
 import com.dySweetFishPlugin.sql.dao.OperatorWait
 import com.sweetfish.service.RetResult
@@ -49,10 +49,10 @@ class BE_Store_GenerateStoreAuthUrl_Douyin implements BusinessExecutor<ProcessId
     @Override
     RetResult<ProcessIdItem> checkExecute(ProcessIdItem source) {
         //检查门店信息
-        ViewStoreInfo viewStoreInfo = storeService.getViewStoreInfo(source.id, source.supplierCode, false, false, false)
-        if (viewStoreInfo == null) return RetResult.<ProcessIdItem> errorT().retinfo("门店不存在")
+        StoreInfo storeInfo = storeService.getStoreInfo(source.id, source.supplierCode, false, false, false)
+        if (storeInfo == null) return RetResult.<ProcessIdItem> errorT().retinfo("门店不存在")
 
-        if (viewStoreInfo.storeInfo.voidFlag == 1) return RetResult.<ProcessIdItem> errorT().retinfo("门店已被禁用,不支持该操作")
+        if (storeInfo.voidFlag == 1) return RetResult.<ProcessIdItem> errorT().retinfo("门店已被禁用,不支持该操作")
 
         return RetResult.<ProcessIdItem> successT().result(source)
     }

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

@@ -180,6 +180,7 @@ public class OrderSearchServiceImpl extends BaseService implements OrderSearchSe
 
 
     @Override
+    @SuppressWarnings("rawtypes")
     public RetResult<OrderRefundRequest> searchOrderRefundRequest(RMap searchData, ERPTokenUser currentUser, String dataSourceId, long supplierCode, ReadOrderOption[] options) {
         return handleScript("ERP_OrderRefundRequest_Search", ERPModule.ERP_ORDER_SEARCH,
                 dataSourceId, supplierCode,
@@ -194,6 +195,7 @@ public class OrderSearchServiceImpl extends BaseService implements OrderSearchSe
     }
 
     @Override
+    @SuppressWarnings("rawtypes")
     public RetResult<List<OrderRefundRequest>> searchOrderRefundRequestList(RMap searchData, ERPTokenUser currentUser, String dataSourceId, long supplierCode, ReadOrderOption[] options) {
         return handleScriptList("ERP_OrderRefundRequest_Search", ERPModule.ERP_ORDER_SEARCH,
                 dataSourceId, supplierCode,
@@ -208,6 +210,7 @@ public class OrderSearchServiceImpl extends BaseService implements OrderSearchSe
     }
 
     @Override
+    @SuppressWarnings("rawtypes")
     public RetResult<List<OrderRefundRequest>> searchOrderRefundRequestList(RMap searchData, ERPTokenUser currentUser, String orderBy, PageFlipper pageFlipper, String dataSourceId, long supplierCode, ReadOrderOption[] options) {
         return handleScriptList("ERP_OrderRefundRequest_Search", ERPModule.ERP_ORDER_SEARCH,
                 dataSourceId, supplierCode,

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

@@ -16,7 +16,7 @@ public interface OrderSearchService extends ScriptService {
     /**
      * 查询单个订单信息
      * <br>在groovy里面使用可以按下面的方法调用
-     * <br>RetResult<PrintOrder> orderResult = orderSearchService.searchBusinessOrder(new RMap<>(ERPUtils.PARAM_SEARCH_ID: 100L), currentUser, dataSourceId, supplierCode)
+     * <br>RetResult<PrintOrder> orderResult = orderSearchService.searchBusinessOrder(new RMap<>("${ERPUtils.PARAM_SEARCH_ID}": 100L), currentUser, dataSourceId, supplierCode)
      * <br>或者在java里面封装一个
      * <br> getBusinessOrder(long id)的方法，提供给其它服务调用，写法差不多，简化不了一行代码
      *
@@ -54,7 +54,7 @@ public interface OrderSearchService extends ScriptService {
     /**
      * 多订单查询，无需分页参数，
      * <br>在groovy里面使用可以按下面的方法调用，比如通过多id获取订单
-     * <br>RetResult<List<BusinessOrder></BusinessOrder>> orderResult = orderSearchService.searchBusinessOrderList(new RMap<>(ERPUtils.PARAM_SEARCH_IDS: "1,2,3"), currentUser, dataSourceId, supplierCode)
+     * <br>RetResult<List<BusinessOrder></BusinessOrder>> orderResult = orderSearchService.searchBusinessOrderList(new RMap<>("${ERPUtils.PARAM_SEARCH_IDS}": "1,2,3"), currentUser, dataSourceId, supplierCode)
      * <br>或者在java里面封装一个
      * <br> getPrintOrder(long id)的方法，提供给其它服务调用，写法差不多，简化不了一行代码
      *
@@ -96,7 +96,7 @@ public interface OrderSearchService extends ScriptService {
     /**
      * 查询单个订单信息
      * <br>在groovy里面使用可以按下面的方法调用
-     * <br>RetResult<PrintOrder> orderResult = orderSearchService.searchBusinessOrder(new RMap<>(ERPUtils.PARAM_SEARCH_ID: 100L), currentUser, dataSourceId, supplierCode)
+     * <br>RetResult<PrintOrder> orderResult = orderSearchService.searchBusinessOrder(new RMap<>("${ERPUtils.PARAM_SEARCH_ID}": 100L), currentUser, dataSourceId, supplierCode)
      * <br>或者在java里面封装一个
      * <br> getBusinessOrder(long id)的方法，提供给其它服务调用，写法差不多，简化不了一行代码
      *
@@ -118,7 +118,7 @@ public interface OrderSearchService extends ScriptService {
     /**
      * 多订单查询，无需分页参数，
      * <br>在groovy里面使用可以按下面的方法调用，比如通过多id获取订单
-     * <br>RetResult<List<BusinessOrder></BusinessOrder>> orderResult = orderSearchService.searchBusinessOrderList(new RMap<>(ERPUtils.PARAM_SEARCH_IDS: "1,2,3"), currentUser, dataSourceId, supplierCode)
+     * <br>RetResult<List<BusinessOrder></BusinessOrder>> orderResult = orderSearchService.searchBusinessOrderList(new RMap<>("${ERPUtils.PARAM_SEARCH_IDS}": "1,2,3"), currentUser, dataSourceId, supplierCode)
      * <br>或者在java里面封装一个
      * <br> getPrintOrder(long id)的方法，提供给其它服务调用，写法差不多，简化不了一行代码
      *