档案类crud

conf/KeyId.xml

@@ -289,4 +289,13 @@
             <TableWhere/>
         </Table>
     </Item>
+
+    <Item>
+        <IDName>tbPlatformInfo.id</IDName>
+        <Table>
+            <TableName>tbPlatformInfo</TableName>
+            <IDFieldName>id</IDFieldName>
+            <TableWhere/>
+        </Table>
+    </Item>
 </Items>

conf/esTemplate/platforminfo.json

@@ -6,7 +6,23 @@
       },
       "platformName": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "platformType": {
         "type": "integer"

conf/esTemplate/platformrequire.json

@@ -6,7 +6,23 @@
       },
       "requireName": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "requireCode": {
         "type": "text",

conf/esTemplate/storeinfo.json

@@ -67,6 +67,9 @@
       "voidFlag": {
         "type": "integer"
       },
+      "enableInvoice": {
+        "type": "integer"
+      },
       "createBy": {
         "type": "long"
       },

conf/eskeys.properties

@@ -59,4 +59,8 @@ es.materialinfo.index = aeerp_materialinfo_
 es.outassistinfo.index = aeerp_outassistinfo_
 #供应商
 es.supplierInfo.index = aeerp_supplierinfo_
+#平台档案
+es.platforminfo.index = dydeliver_platforminfo_
+#平台需求信息档案
+es.platformrequire.index = dydeliver_platformrequire_
 

conf/初始化业务表.sql

@@ -204,6 +204,7 @@ create table tbStoreInfo1000(
                                 legalPersonIdNo	varchar(100) default '',
                                 legalPersonName	varchar(50) default '',
                                 voidFlag	int default 0,
+                                enableInvoice	int default 0,
                                 createBy	bigint  default 0,
                                 createTime	datetime default NOW(),
                                 createTimeLong	bigint  default 0,

ddBusiness/src/main/java/com/dderp/business/dao/PlatformDao.java

@@ -0,0 +1,31 @@
+package com.dderp.business.dao;
+
+import com.dderp.common.entity.platform.PlatformInfo;
+import com.dySweetFishPlugin.sql.dao.*;
+import org.rex.RMap;
+
+import java.util.List;
+
+public interface PlatformDao extends DaoRepository {
+
+    @Sharding(databaseShardingStrategy = SupplierDataBaseShardingStrategy.class, tableShardingStrategy = SupplierTableShardingStrategy.class)
+    @DAOMethod(operator = OperatorType.QUERY, owait = OperatorWait.AWAIT)
+    @SqlId(clazz = PlatformDao.class, sql = "queryPlatformInfoList", table = "tbPlatformInfo", params = {1})
+    List<PlatformInfo> queryPlatformInfoList(RMap params, @DatabaseShardingBy String dataSourceId, @TableShardingBy Long supplierCode);
+
+    @Sharding(databaseShardingStrategy = SupplierDataBaseShardingStrategy.class, tableShardingStrategy = SupplierTableShardingStrategy.class)
+    @DAOMethod(operator = OperatorType.UPDATE, owait = OperatorWait.ASNYC)
+    @SqlId(clazz = PlatformDao.class, sql = "addPlatformInfo", table = "tbPlatformInfo", params = {1})
+    int addPlatformInfo(PlatformInfo platformInfo, @DatabaseShardingBy String dataSourceId, @TableShardingBy Long supplierCode);
+
+    @Sharding(databaseShardingStrategy = SupplierDataBaseShardingStrategy.class, tableShardingStrategy = SupplierTableShardingStrategy.class)
+    @DAOMethod(operator = OperatorType.UPDATE, owait = OperatorWait.ASNYC)
+    @SqlId(clazz = PlatformDao.class, sql = "updatePlatformInfo", table = "tbPlatformInfo", params = {1})
+    int updatePlatformInfo(PlatformInfo platformInfo, @DatabaseShardingBy String dataSourceId, @TableShardingBy Long supplierCode);
+
+    @Sharding(databaseShardingStrategy = SupplierDataBaseShardingStrategy.class, tableShardingStrategy = SupplierTableShardingStrategy.class)
+    @DAOMethod(operator = OperatorType.UPDATE, owait = OperatorWait.ASNYC)
+    @SqlId(clazz = PlatformDao.class, sql = "voidPlatformInfo", table = "tbPlatformInfo", params = {1})
+    int voidPlatformInfo(PlatformInfo platformInfo, @DatabaseShardingBy String dataSourceId, @TableShardingBy Long supplierCode);
+
+}

ddBusiness/src/main/java/com/dderp/business/service/PlatformServiceImpl.java

@@ -0,0 +1,255 @@
+package com.dderp.business.service;
+
+import com.dderp.business.dao.PlatformDao;
+import com.dderp.common.api.NoSqlKeysService;
+import com.dderp.common.api.PlatformService;
+import com.dderp.common.base.BaseService;
+import com.dderp.common.datas.ESKeys;
+import com.dderp.common.datas.business.PlatformType;
+import com.dderp.common.entity.platform.PlatformInfo;
+import com.dderp.common.entity.platform.PlatformRequire;
+import com.dderp.common.entity.site.ERPTokenUser;
+import com.dderp.common.tool.ERPUtils;
+import com.dySweetFishPlugin.elasticsearch.ESClient;
+import com.dySweetFishPlugin.sql.TableIdService;
+import com.dySweetFishPlugin.sql.dao.TunaService;
+import com.sweetfish.convert.json.JsonConvert;
+import com.sweetfish.service.Local;
+import com.sweetfish.service.RetResult;
+import com.sweetfish.source.PageFlipper;
+import com.sweetfish.util.AnyValue;
+import com.sweetfish.util.AutoLoad;
+import com.sweetfish.util.ResourceType;
+import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.action.DocWriteResponse;
+import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.action.support.WriteRequest;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.Operator;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.sort.SortBuilders;
+import org.elasticsearch.search.sort.SortOrder;
+import org.rex.RMap;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.List;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+
+@AutoLoad(value = false)
+@Local
+@ResourceType(PlatformService.class)
+public class PlatformServiceImpl extends BaseService implements PlatformService {
+    @Resource
+    private ESClient esClient;
+
+    @Resource
+    private JsonConvert jsonConvert;
+
+    @Resource
+    private NoSqlKeysService keysService;
+
+    @Resource
+    private TableIdService tableIdService;
+
+    @Resource
+    private TunaService tunaService;
+
+    private PlatformDao platformDao;
+
+    @Override
+    public void start(AnyValue config) {
+        super.start(config);
+        platformDao = tunaService.generate(PlatformDao.class);
+    }
+
+    @Override
+    public List<PlatformInfo> queryPlatformList(RMap params, PageFlipper pageFlipper, long supplierCode) {
+        List<PlatformInfo> platformInfoList = searchESList(esClient, jsonConvert,
+                PlatformInfo.class,
+                null,
+                ((sd) -> {
+                    BoolQueryBuilder qb = QueryBuilders.boolQuery();
+                    qb = qb.must(QueryBuilders.typeQuery(ESKeys.ES_DELIVER_PLATFORM_INFO_TYPE));
+
+                    if (ERPUtils.mapContainKey(params, "platformType")) {
+                        qb = qb.must(QueryBuilders.termQuery("platformType", params.getInt("platformType")));
+                    }
+
+                    if (ERPUtils.mapContainKey(params, "platformName")) {
+                        String platformName = params.getString("platformName");
+                        BoolQueryBuilder qbPlatformName = QueryBuilders.boolQuery()
+                                .should(QueryBuilders.matchQuery("platformName", platformName).analyzer("query_ansj").operator(Operator.AND))
+                                .should(QueryBuilders.termQuery("platformName.number", platformName.toLowerCase()))
+                                .should(QueryBuilders.matchQuery("platformName.letter", platformName.toLowerCase()).operator(Operator.AND));
+                        qb = qb.must(qbPlatformName);
+                    }
+
+                    if (ERPUtils.mapContainKey(params, "voidFlag")) {
+                        qb = qb.must(QueryBuilders.termQuery("voidFlag", params.getInt("voidFlag")));
+                    }
+
+                    return qb;
+                }),
+                keysService.getESKey(ESKeys.ES_DELIVER_PLATFORM_INFO_INDEX, supplierCode),
+                (() -> SortBuilders.fieldSort("id").order(SortOrder.DESC)));
+
+        return platformInfoList;
+    }
+
+    @Override
+    public PlatformInfo getPlatformInfo(long idPlatformInfo, long supplierCode) {
+        return this.getESOneInfo(esClient, jsonConvert,
+                PlatformInfo.class,
+                String.valueOf(idPlatformInfo),
+                keysService.getESKey(ESKeys.ES_DELIVER_PLATFORM_INFO_INDEX, supplierCode),
+                ESKeys.ES_DELIVER_PLATFORM_INFO_TYPE,
+                null);
+    }
+
+    @Override
+    public RetResult<PlatformInfo> addPlatformInfo(PlatformInfo platformInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode) {
+        if (StringUtils.isBlank(platformInfo.getPlatformName()))
+            return RetResult.<PlatformInfo>errorT().retinfo("平台名称不可为空");
+
+        if (PlatformType.getName(platformInfo.getPlatformType()) == null)
+            return RetResult.<PlatformInfo>errorT().retinfo("平台类型非法");
+
+        //先查一下有没有重名的平台信息
+        PlatformInfo esInfo = this.getESOneInfo(esClient, jsonConvert,
+                PlatformInfo.class,
+                (a) -> {
+                    BoolQueryBuilder qb = QueryBuilders.boolQuery().must(QueryBuilders.typeQuery(ESKeys.ES_DELIVER_PLATFORM_INFO_TYPE));
+                    qb.must(QueryBuilders.termQuery("platformName.raw", platformInfo.getPlatformName()));
+                    qb.must(QueryBuilders.termQuery("platformType", platformInfo.getPlatformType()));
+
+                    return qb;
+                },
+                keysService.getESKey(ESKeys.ES_DELIVER_PLATFORM_INFO_INDEX, supplierCode),
+                null);
+
+        if (esInfo != null) return RetResult.<PlatformInfo>errorT().retinfo("已存在同名的平台");
+
+        platformInfo.setId(tableIdService.getTableIdMulti("tbPlatformInfo.id", 1, dataSourceId, String.valueOf(supplierCode)));
+        //前端传进来的是平台需求的list,由于获取平台信息的时候几乎必带需求信息而且一般不会很多,所以不做子表直接序列化进主表
+        platformInfo.setRequireListSerial(jsonConvert.convertTo(platformInfo.getRequireList()));
+        PlatformInfo.create(platformInfo, currentUser.getId());
+
+        IndexResponse itemResponse = esClient.getClient()
+                .prepareIndex(keysService.getESKey(ESKeys.ES_DELIVER_PLATFORM_INFO_INDEX, supplierCode), ESKeys.ES_DELIVER_PLATFORM_INFO_TYPE)
+                .setId(String.valueOf(platformInfo.getId()))
+                .setSource(jsonConvert.convertTo(platformInfo), XContentType.JSON)
+                .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
+                .get();
+
+        if (itemResponse.getResult() == DocWriteResponse.Result.CREATED) {
+            platformDao.addPlatformInfo(platformInfo, dataSourceId, supplierCode);
+        } else {
+            return RetResult.<PlatformInfo>errorT().retinfo("创建平台档案失败");
+        }
+
+        return RetResult.<PlatformInfo>successT().result(platformInfo);
+
+    }
+
+    @Override
+    public RetResult<PlatformInfo> updatePlatformInfo(PlatformInfo platformInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode) {
+        PlatformInfo esInfo = this.getPlatformInfo(platformInfo.getId(), supplierCode);
+        if (esInfo == null)
+            return RetResult.<PlatformInfo>errorT().retinfo("平台信息不存在");
+
+        esInfo.setPlatformName(platformInfo.getPlatformName());
+        esInfo.setPlatformType(platformInfo.getPlatformType());
+        esInfo.setRequireListSerial(jsonConvert.convertTo(platformInfo.getRequireList()));
+
+        PlatformInfo.update(esInfo, currentUser.getId());
+        try {
+            esClient.getClient().prepareUpdate(keysService.getESKey(ESKeys.ES_DELIVER_PLATFORM_INFO_INDEX, supplierCode),
+                            ESKeys.ES_DELIVER_PLATFORM_INFO_TYPE, String.valueOf(esInfo.getId()))
+                    .setDoc(jsonBuilder()
+                            .startObject()
+                            .field("platformName", esInfo.getPlatformName())
+                            .field("platformType", esInfo.getPlatformType())
+                            .field("requireListSerial", esInfo.getRequireListSerial())
+                            .field("updateBy", esInfo.getUpdateBy())
+                            .field("updateTimeLong", esInfo.getUpdateTimeLong())
+                            .endObject())
+                    .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
+                    .get();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        platformDao.updatePlatformInfo(esInfo, dataSourceId, supplierCode);
+
+        return RetResult.<PlatformInfo>successT().result(esInfo);
+    }
+
+    @Override
+    public RetResult<PlatformInfo> voidPlatformInfo(PlatformInfo platformInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode) {
+        PlatformInfo esInfo = this.getPlatformInfo(platformInfo.getId(), supplierCode);
+        if (esInfo == null)
+            return RetResult.<PlatformInfo>errorT().retinfo("平台信息不存在");
+
+        esInfo.setVoidFlag(platformInfo.getVoidFlag());
+
+        PlatformInfo.update(esInfo, currentUser.getId());
+        try {
+            esClient.getClient().prepareUpdate(keysService.getESKey(ESKeys.ES_DELIVER_PLATFORM_INFO_INDEX, supplierCode),
+                            ESKeys.ES_DELIVER_PLATFORM_INFO_TYPE, String.valueOf(esInfo.getId()))
+                    .setDoc(jsonBuilder()
+                            .startObject()
+                            .field("voidFlag", esInfo.getVoidFlag())
+                            .field("updateBy", esInfo.getUpdateBy())
+                            .field("updateTimeLong", esInfo.getUpdateTimeLong())
+                            .endObject())
+                    .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
+                    .get();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        platformDao.voidPlatformInfo(esInfo, dataSourceId, supplierCode);
+
+        return RetResult.<PlatformInfo>successT().result(esInfo);
+    }
+
+    @Override
+    public List<PlatformRequire> queryPlatformRequireList(RMap params, PageFlipper pageFlipper, long supplierCode) {
+        return this.searchESList(esClient, jsonConvert, PlatformRequire.class,
+                params,
+                (a) -> {
+                    BoolQueryBuilder qb = QueryBuilders.boolQuery().must(QueryBuilders.typeQuery(ESKeys.ES_DELIVER_PLATFORM_REQUIRE_TYPE));
+
+                    if (ERPUtils.mapContainKey(params, "requireName")) {
+                        String requireName = params.getString("requireName");
+                        BoolQueryBuilder qbRequireName = QueryBuilders.boolQuery()
+                                .should(QueryBuilders.matchQuery("requireName", requireName).analyzer("query_ansj").operator(Operator.AND))
+                                .should(QueryBuilders.termQuery("requireName.number", requireName.toLowerCase()))
+                                .should(QueryBuilders.matchQuery("requireName.letter", requireName.toLowerCase()).operator(Operator.AND));
+                        qb = qb.must(qbRequireName);
+                    }
+
+                    return qb;
+                },
+                keysService.getESKey(ESKeys.ES_DELIVER_PLATFORM_REQUIRE_INDEX, supplierCode),
+                (() -> SortBuilders.fieldSort("id").order(SortOrder.DESC)));
+    }
+
+    @Override
+    public PlatformRequire addPlatformRequire(PlatformRequire platformRequire, ERPTokenUser currentUser, String dataSourceId, long supplierCode) {
+        return null;
+    }
+
+    @Override
+    public RetResult<PlatformRequire> updatePlatformRequire(PlatformRequire platformRequire, ERPTokenUser currentUser, String dataSourceId, long supplierCode) {
+        return null;
+    }
+
+    @Override
+    public RetResult<PlatformRequire> voidPlatformRequire(PlatformRequire platformRequire, ERPTokenUser currentUser, String dataSourceId, long supplierCode) {
+        return null;
+    }
+}

ddCommon/src/main/java/com/dderp/common/api/OrderService.java

@@ -0,0 +1,8 @@
+package com.dderp.common.api;
+
+import com.sweetfish.util.AutoLoad;
+
+@AutoLoad(value = false)
+public interface OrderService extends ScriptService{
+
+}

ddCommon/src/main/java/com/dderp/common/api/BusinessDocService.java

@@ -1,6 +1,7 @@
 package com.dderp.common.api;
 
 import com.dderp.common.entity.platform.PlatformInfo;
+import com.dderp.common.entity.platform.PlatformRequire;
 import com.dderp.common.entity.site.ERPTokenUser;
 import com.sweetfish.service.RetResult;
 import com.sweetfish.source.PageFlipper;
@@ -10,16 +11,28 @@ import org.rex.RMap;
 import java.util.List;
 
 @AutoLoad(value = false)
-public interface BusinessDocService extends ScriptService {
+public interface PlatformService extends ScriptService {
     //region 平台档案
     List<PlatformInfo> queryPlatformList(RMap params, PageFlipper pageFlipper, long supplierCode);
 
+    PlatformInfo getPlatformInfo(long idPlatformInfo, long supplierCode);
+
     RetResult<PlatformInfo> addPlatformInfo(PlatformInfo platformInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
 
     RetResult<PlatformInfo> updatePlatformInfo(PlatformInfo platformInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
 
     RetResult<PlatformInfo> voidPlatformInfo(PlatformInfo platformInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    List<PlatformRequire> queryPlatformRequireList(RMap params, PageFlipper pageFlipper, long supplierCode);
+
+    PlatformRequire addPlatformRequire(PlatformRequire platformRequire, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<PlatformRequire> updatePlatformRequire(PlatformRequire platformRequire, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<PlatformRequire> voidPlatformRequire(PlatformRequire platformRequire, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
     //endregion
 
 
+
+
 }

ddCommon/src/main/java/com/dderp/common/api/StoreService.java

@@ -0,0 +1,43 @@
+package com.dderp.common.api;
+
+import com.dderp.common.entity.site.ERPTokenUser;
+import com.dderp.common.entity.store.*;
+import com.sweetfish.service.RetResult;
+import com.sweetfish.source.PageFlipper;
+import com.sweetfish.util.AutoLoad;
+import org.rex.RMap;
+
+import java.util.List;
+
+@AutoLoad(value = false)
+public interface StoreService extends ScriptService {
+    //region 门店品牌档案
+    List<StoreBrand> queryStoreBrandList(RMap params, PageFlipper pageFlipper, long supplierCode);
+
+    RetResult<StoreBrand> addStoreBrand(StoreBrand storeBrand, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<StoreBrand> updateStoreBrand(StoreBrand storeBrand, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<StoreBrand> voidStoreBrand(StoreBrand storeBrand, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+    //endregion
+
+    //region 门店管理
+    List<ViewStoreInfo> queryViewStoreInfo(RMap params, PageFlipper pageFlipper, long supplierCode);
+
+    ViewStoreInfo getViewStoreInfo(long idStore, long supplierCode, int withInvoice);
+
+    RetResult<StoreInfo> addStoreInfo(StoreInfo storeInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<StoreInvoiceInfo> configStoreInvoiceInfo(StoreInvoiceInfo invoiceInfo, int enableInvoice, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<StoreInfo> updateStoreInfo(StoreInfo storeInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<StoreInfo> voidStoreInfo(StoreInfo storeInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<StorePlatform> addStorePlatform(StorePlatform storePlatform, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<StorePlatform> configStorePlatform(StorePlatform storePlatform, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+    //endregion
+
+
+}

ddCommon/src/main/java/com/dderp/common/datas/ESKeys.java

@@ -188,4 +188,14 @@ public class ESKeys {
     public static final String ES_ERP_SUPPLIER_INFO_INDEX = "es.supplierInfo.index";
     public static final String ES_ERP_SUPPLIER_INFO_TYPE = "info";
     //endregion
+
+    //region 平台档案,包括订单和配送平台
+    public static final String ES_DELIVER_PLATFORM_INFO_INDEX = "es.platforminfo.index";
+    public static final String ES_DELIVER_PLATFORM_INFO_TYPE = "info";
+    //endregion
+
+    //region 平台需求信息档案
+    public static final String ES_DELIVER_PLATFORM_REQUIRE_INDEX = "es.platformrequire.index";
+    public static final String ES_DELIVER_PLATFORM_REQUIRE_TYPE = "info";
+    //endregion
 }

ddCommon/src/main/java/com/dderp/common/entity/store/StoreInfo.java

@@ -87,6 +87,9 @@ public class StoreInfo extends BaseEntity {
     @RColumn("voidflag")
     private int voidFlag;
 
+    @Comment("启用开票信息标记")
+    @RColumn("enableinvoice")
+    private int enableInvoice;
     @Comment("门店开票信息")
     private StoreInvoiceInfo invoiceInfo;
 
@@ -271,4 +274,12 @@ public class StoreInfo extends BaseEntity {
     public void setVoidFlag(int voidFlag) {
         this.voidFlag = voidFlag;
     }
+
+    public int getEnableInvoice() {
+        return enableInvoice;
+    }
+
+    public void setEnableInvoice(int enableInvoice) {
+        this.enableInvoice = enableInvoice;
+    }
 }