采购配置相关

ms-api/src/main/java/com/ms/api/dto/order/AllowAutoPurchaseProductDTO.java

@@ -1,11 +1,11 @@
-package com.ms.api.bo;
+package com.ms.api.dto.order;
 
 import lombok.Data;
 
 import java.math.BigDecimal;
 
 @Data
-public class AllowAutoPurchaseProductBo {
+public class AllowAutoPurchaseProductDTO {
     /**
      * 商品id
      */

ms-api/src/main/java/com/ms/api/dto/order/DsPurchaseSettingDTO.java

@@ -1,13 +1,12 @@
-package com.ms.api.bo;
+package com.ms.api.dto.order;
 
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.Map;
 
 @Data
-public class DsPurchaseSettingBo {
+public class DsPurchaseSettingDTO {
 
     /**
      * 当检测到采购单修改物流单号后，尝试自动替换对应订单的物流单号
@@ -72,11 +71,11 @@ public class DsPurchaseSettingBo {
     /**
      * 要过滤自动采购的商品
      */
-    private Map<Long, FilterAutoPurchaseProductBo> filterAutoPurchaseProducts;
+    private Map<Long, FilterAutoPurchaseProductDTO> filterAutoPurchaseProducts;
 
     /**
      * 允许自动采购的商品
      */
-    private Map<Long, AllowAutoPurchaseProductBo> allowAutoPurchaseProducts;
+    private Map<Long, AllowAutoPurchaseProductDTO> allowAutoPurchaseProducts;
 
 }

ms-api/src/main/java/com/ms/api/dto/order/FilterAutoPurchaseProductDTO.java

@@ -1,11 +1,11 @@
-package com.ms.api.bo;
+package com.ms.api.dto.order;
 
 import lombok.Data;
 
 import java.math.BigDecimal;
 
 @Data
-public class FilterAutoPurchaseProductBo {
+public class FilterAutoPurchaseProductDTO {
     /**
      * 商品id
      */

ms-api/src/main/java/com/ms/api/dto/order/GetPurchaseSettingResponseDTO.java

@@ -4,4 +4,14 @@ import lombok.Data;
 
 @Data
 public class GetPurchaseSettingResponseDTO {
+
+    /**
+     * 采购配置,下游存储
+     */
+    private PurchaseSettingDTO purchaseSetting;
+
+    /**
+     * 分销采购配置，下游存储
+     */
+    private DsPurchaseSettingDTO dsPurchaseSetting;
 }

ms-api/src/main/java/com/ms/api/dto/order/PurchaseSettingDTO.java

@@ -1,9 +1,9 @@
-package com.ms.api.bo;
+package com.ms.api.dto.order;
 
 import lombok.Data;
 
 @Data
-public class PurchaseSettingBO {
+public class PurchaseSettingDTO {
     /**
      * 是否自动同步采购信息到商家备注
      */

ms-biz/src/main/java/com/ms/api/service/PurchaseOrderService.java

@@ -1,7 +1,7 @@
 package com.ms.api.service;
 
-import com.ms.api.bo.DsPurchaseSettingBo;
+import com.ms.api.dto.order.DsPurchaseSettingDTO;
-import com.ms.api.bo.PurchaseSettingBO;
+import com.ms.api.dto.order.PurchaseSettingDTO;
 import com.ms.api.common.Pager;
 import com.ms.api.dto.order.SearchDsOrderFilterDTO;
 import com.ms.dal.entity.OpOrder;
@@ -34,9 +34,9 @@ public interface PurchaseOrderService  {
     List<PurchaseOrder> getListByOrderId(Long shopId, String orderId, @Nullable String status, boolean needItems);
     Pager<OpOrder> searchDsOrderList(String shopId, Integer page, Integer pageSize, SearchDsOrderFilterDTO filter, Boolean isEnsconceString, Boolean needOutstorageResult);
 
-    PurchaseSettingBO getPurchaseSetting(Long shopId);
+    PurchaseSettingDTO getPurchaseSetting(Long shopId);
 
-    boolean savePurchaseSetting(Long shopId, PurchaseSettingBO purchaseSettingBO);
+    boolean savePurchaseSetting(Long shopId, PurchaseSettingDTO purchaseSettingDTO);
 
-    DsPurchaseSettingBo getDsPurchaseSettingByShopId(Long shopId);
+    DsPurchaseSettingDTO getDsPurchaseSettingByShopId(Long shopId);
 }

ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java

@@ -22,10 +22,10 @@ import com.doudian.open.api.order_BatchSearchIndex.data.OrderBatchSearchIndexDat
 import com.doudian.open.api.order_BatchSearchIndex.data.PlainToEncryptIndexListItem;
 import com.doudian.open.api.order_BatchSearchIndex.param.OrderBatchSearchIndexParam;
 import com.doudian.open.api.order_BatchSearchIndex.param.PlainTextListItem;
-import com.ms.api.bo.AllowAutoPurchaseProductBo;
+import com.ms.api.dto.order.AllowAutoPurchaseProductDTO;
-import com.ms.api.bo.DsPurchaseSettingBo;
+import com.ms.api.dto.order.DsPurchaseSettingDTO;
-import com.ms.api.bo.FilterAutoPurchaseProductBo;
+import com.ms.api.dto.order.FilterAutoPurchaseProductDTO;
-import com.ms.api.bo.PurchaseSettingBO;
+import com.ms.api.dto.order.PurchaseSettingDTO;
 import com.ms.api.common.Pager;
 import com.ms.api.consts.*;
 import com.ms.api.dto.order.SearchDsOrderFilterDTO;
@@ -572,7 +572,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         return rows.stream().collect(Collectors.toMap(PurchaseOrderSetting::getPurchaseOrderId, x -> x));
     }
 
-    public PurchaseSettingBO getPurchaseSetting(Long shopId) {
+    public PurchaseSettingDTO getPurchaseSetting(Long shopId) {
         PurchaseSetting purchaseSetting = purchaseSettingMapper.selectByShopId(shopId);
 //        boolean isNewestVersion = purchaseSetting.version = PurchaseOrderConst.CURRENT_PURCHASE_SETTING_VERSION;
 
@@ -605,41 +605,41 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
             autoFillOrderMemoTpl = purchaseSetting.getAutoFillOrderMemoTpl();
         }
 
-        PurchaseSettingBO purchaseSettingBO = new PurchaseSettingBO();
+        PurchaseSettingDTO purchaseSettingDTO = new PurchaseSettingDTO();
-        purchaseSettingBO.setIsAppendShopRemark(isAppendShopRemark);
+        purchaseSettingDTO.setIsAppendShopRemark(isAppendShopRemark);
-        purchaseSettingBO.setIsAppendShopNote(isAppendShopNote);
+        purchaseSettingDTO.setIsAppendShopNote(isAppendShopNote);
-        purchaseSettingBO.setIsAutoFillRemark(isAutoFillRemark);
+        purchaseSettingDTO.setIsAutoFillRemark(isAutoFillRemark);
-        purchaseSettingBO.setIsAutoFillOrderMemo(isAutoFillOrderMemo);
+        purchaseSettingDTO.setIsAutoFillOrderMemo(isAutoFillOrderMemo);
-        purchaseSettingBO.setAppendShopRemarkTpl(appendShopRemarkTpl);
+        purchaseSettingDTO.setAppendShopRemarkTpl(appendShopRemarkTpl);
-        purchaseSettingBO.setAppendShopNoteTpl(appendShopNoteTpl);
+        purchaseSettingDTO.setAppendShopNoteTpl(appendShopNoteTpl);
-        purchaseSettingBO.setAutoFillRemarkTpl(autoFillRemarkTpl);
+        purchaseSettingDTO.setAutoFillRemarkTpl(autoFillRemarkTpl);
-        purchaseSettingBO.setAutoFillOrderMemoTpl(autoFillOrderMemoTpl);
+        purchaseSettingDTO.setAutoFillOrderMemoTpl(autoFillOrderMemoTpl);
 
         if (purchaseSetting == null) {
-            savePurchaseSetting(shopId, purchaseSettingBO);
+            savePurchaseSetting(shopId, purchaseSettingDTO);
         }
 
-        return purchaseSettingBO;
+        return purchaseSettingDTO;
     }
 
-    public boolean savePurchaseSetting(Long shopId, PurchaseSettingBO purchaseSettingBO) {
+    public boolean savePurchaseSetting(Long shopId, PurchaseSettingDTO purchaseSettingDTO) {
         // todo:
 
         return false;
     }
 
-    public DsPurchaseSettingBo getDsPurchaseSettingByShopId(Long shopId) {
+    public DsPurchaseSettingDTO getDsPurchaseSettingByShopId(Long shopId) {
         DsPurchaseSetting dsPurchaseSetting = dsPurchaseSettingMapper.selectByShopId(shopId);
 
         List<DsAllowAutoPurchaseProduct> dsAllowAutoPurchaseProductList = dsAllowAutoPurchaseProductMapper.getListByShopId(shopId);
         List<DsFilterAutoPurchaseProduct> dsFilterAutoPurchaseProductList = dsFilterAutoPurchaseProductMapper.getListByShopId(shopId);
 
-        DsPurchaseSettingBo ret = new DsPurchaseSettingBo();
+        DsPurchaseSettingDTO ret = new DsPurchaseSettingDTO();
-        Map<Long, AllowAutoPurchaseProductBo> allowAutoPurchaseProductMap = new HashMap<>();
+        Map<Long, AllowAutoPurchaseProductDTO> allowAutoPurchaseProductMap = new HashMap<>();
-        Map<Long, FilterAutoPurchaseProductBo> filterAutoPurchaseProductMap = new HashMap<>();
+        Map<Long, FilterAutoPurchaseProductDTO> filterAutoPurchaseProductMap = new HashMap<>();
 
         for (DsAllowAutoPurchaseProduct product : dsAllowAutoPurchaseProductList) {
-            AllowAutoPurchaseProductBo item = new AllowAutoPurchaseProductBo();
+            AllowAutoPurchaseProductDTO item = new AllowAutoPurchaseProductDTO();
             item.setProductId(product.getProductId());
             item.setName(product.getName());
             item.setImg(product.getImg());
@@ -648,7 +648,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         }
 
         for (DsFilterAutoPurchaseProduct product : dsFilterAutoPurchaseProductList) {
-            FilterAutoPurchaseProductBo item = new FilterAutoPurchaseProductBo();
+            FilterAutoPurchaseProductDTO item = new FilterAutoPurchaseProductDTO();
             item.setProductId(product.getProductId());
             item.setName(product.getName());
             item.setImg(product.getImg());
@@ -669,7 +669,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
             ret.setIsUseAllProduct(1);
             ret.setIsUsePartProduct(0);
             ret.setIsForbidIsolationPurchase(0);
-
         } else {
             ret.setIsPurchaseLogisticsUpdateToPlatform(dsPurchaseSetting.getIsPurchaseLogisticsUpdateToPlatform());
             ret.setDeliveryTimeType(dsPurchaseSetting.getDeliveryTimeType());
@@ -683,7 +682,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
             ret.setIsUseAllProduct(dsPurchaseSetting.getIsUseAllProduct());
             ret.setIsUsePartProduct(dsPurchaseSetting.getIsUsePartProduct());
             ret.setIsForbidIsolationPurchase(dsPurchaseSetting.getIsForbidIsolationPurchase());
-
         }
 
         ret.setFilterAutoPurchaseProducts(filterAutoPurchaseProductMap);
@@ -707,9 +705,28 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         return redisTemplate.opsForSet().isMember(RedisKeyConst.DS_AUTO_PURCHASE_WHITELIST, memberId);
     }
 
-    public void initDsPurchaseSetting(Long shopId) {
+    public int initDsPurchaseSetting(Long shopId) {
-        // todo:
+        DsPurchaseSetting obj = new DsPurchaseSetting();
-
+        // 设置默认值
+        obj.setIsAutoPurchase(0);
+        obj.setIsAutoPay(0);
+        obj.setDelayPurchaseMinute(0);
+        obj.setForbiddenPurchaseProfit(BigDecimal.ZERO);
+        obj.setIsUseForbiddenPurchaseProfit(0);
+        obj.setIsUseForbiddenKeywords(0);
+        obj.setForbiddenKeywords("");
+        obj.setIsUseAllProduct(1);
+        obj.setIsUsePartProduct(0);
+        obj.setIsForbidIsolationPurchase(0);
+        obj.setDeliveryTimeType(PurchaseOrderConst.DELIVERY_TIME_TYPE_RIGHT_NOW);
+        obj.setIsPurchaseLogisticsUpdateToPlatform(0);
+
+        obj.setShopId(shopId);
+        obj.setActionSource(PurchaseOrderConst.ACTION_SOURCE_INIT_DS_PURCHASE_SETTING);
+        obj.setGmtCreate(new Date());
+        obj.setGmtModified(new Date());
+
+        return dsPurchaseSettingMapper.insert(obj);
     }
 
     public void getOrderAndPurchaseOrdersMap(String shopId, List<String> shopIds,

ms-biz/src/main/java/com/ms/api/spi/order/GetPurchaseSettingService.java

@@ -4,9 +4,10 @@ import com.jinritemai.cloud.base.api.BaseRequest;
 import com.jinritemai.cloud.base.api.BaseResponse;
 import com.jinritemai.cloud.base.api.ExtensionService;
 import com.jinritemai.cloud.base.api.ExtensionServiceHandler;
-import com.ms.api.bo.PurchaseSettingBO;
 import com.ms.api.common.SPIBaseService;
+import com.ms.api.dto.order.DsPurchaseSettingDTO;
 import com.ms.api.dto.order.GetPurchaseSettingResponseDTO;
+import com.ms.api.dto.order.PurchaseSettingDTO;
 import com.ms.api.service.PurchaseOrderService;
 import com.ms.api.util.PurchaseOrderUtil;
 import lombok.AllArgsConstructor;
@@ -29,9 +30,17 @@ public class GetPurchaseSettingService extends SPIBaseService implements Extensi
 //        GetPurchaseSettingRequestDTO requestDTO = req.getData();
         // todo: 获取shopid
         Long shopId = 0L;
-        PurchaseSettingBO purchaseSettingBO = purchaseOrderUtil.getPurchaseSetting(shopId);
+        PurchaseSettingDTO purchaseSetting = purchaseOrderUtil.getPurchaseSetting(shopId);
+        DsPurchaseSettingDTO dsPurchaseSetting = purchaseOrderService.getDsPurchaseSettingByShopId(shopId);
 
-
+        GetPurchaseSettingResponseDTO ret = new GetPurchaseSettingResponseDTO();
-        return null;
+        ret.setPurchaseSetting(purchaseSetting);
+        ret.setDsPurchaseSetting(dsPurchaseSetting);
+        return BaseResponse.<GetPurchaseSettingResponseDTO>builder()
+                .success(true)
+                .message("success")
+                .data(ret)
+                .code("10000")
+                .build();
     }
 }

ms-biz/src/main/java/com/ms/api/util/PurchaseOrderUtil.java

@@ -9,9 +9,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.jinritemai.cloud.base.api.BaseResponse;
+import com.ms.api.dto.order.PurchaseSettingDTO;
-import com.ms.api.bo.PurchaseSettingBO;
-import com.ms.api.common.R;
 import com.ms.api.consts.DsOrderConst;
 import com.ms.api.consts.OrderConst;
 import com.ms.api.consts.PurchaseOrderConst;
@@ -215,7 +213,7 @@ public class PurchaseOrderUtil {
         return params;
     }
 
-    public PurchaseSettingBO getPurchaseSetting(Long operateShopId) {
+    public PurchaseSettingDTO getPurchaseSetting(Long operateShopId) {
         return purchaseOrderService.getPurchaseSetting(operateShopId);
     }