Explorar o código

优化 查询华宁欠费明细bug

java110 %!s(int64=5) %!d(string=hai) anos
pai
achega
90c39cd418
Modificáronse 100 ficheiros con 0 adicións e 5550 borrados
  1. 0 1
      pom.xml
  2. 0 71
      service-goods/pom.xml
  3. 0 68
      service-goods/src/main/java/com/java110/goods/GoodsServiceApplicationStart.java
  4. 0 559
      service-goods/src/main/java/com/java110/goods/api/GroupBuyApi.java
  5. 0 851
      service-goods/src/main/java/com/java110/goods/api/ProductApi.java
  6. 0 125
      service-goods/src/main/java/com/java110/goods/api/ProductCategoryApi.java
  7. 0 463
      service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java
  8. 0 137
      service-goods/src/main/java/com/java110/goods/api/StoreOrderCartReturnApi.java
  9. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuy/IDeleteGroupBuyBMO.java
  10. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuy/IGetGroupBuyBMO.java
  11. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuy/ISaveGroupBuyBMO.java
  12. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuy/IUpdateGroupBuyBMO.java
  13. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/groupBuy/impl/DeleteGroupBuyBMOImpl.java
  14. 0 44
      service-goods/src/main/java/com/java110/goods/bmo/groupBuy/impl/GetGroupBuyBMOImpl.java
  15. 0 38
      service-goods/src/main/java/com/java110/goods/bmo/groupBuy/impl/SaveGroupBuyBMOImpl.java
  16. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/groupBuy/impl/UpdateGroupBuyBMOImpl.java
  17. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/IDeleteGroupBuyBatchBMO.java
  18. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/IGetGroupBuyBatchBMO.java
  19. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/ISaveGroupBuyBatchBMO.java
  20. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/IUpdateGroupBuyBatchBMO.java
  21. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/impl/DeleteGroupBuyBatchBMOImpl.java
  22. 0 44
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/impl/GetGroupBuyBatchBMOImpl.java
  23. 0 38
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/impl/SaveGroupBuyBatchBMOImpl.java
  24. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/impl/UpdateGroupBuyBatchBMOImpl.java
  25. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/IDeleteGroupBuyProductBMO.java
  26. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/IGetGroupBuyProductBMO.java
  27. 0 22
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/ISaveGroupBuyProductBMO.java
  28. 0 22
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/IUpdateGroupBuyProductBMO.java
  29. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/impl/DeleteGroupBuyProductBMOImpl.java
  30. 0 184
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/impl/GetGroupBuyProductBMOImpl.java
  31. 0 68
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/impl/SaveGroupBuyProductBMOImpl.java
  32. 0 48
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/impl/UpdateGroupBuyProductBMOImpl.java
  33. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/IDeleteGroupBuyProductSpecBMO.java
  34. 0 16
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/IGetGroupBuyProductSpecBMO.java
  35. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/ISaveGroupBuyProductSpecBMO.java
  36. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/IUpdateGroupBuyProductSpecBMO.java
  37. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/impl/DeleteGroupBuyProductSpecBMOImpl.java
  38. 0 44
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/impl/GetGroupBuyProductSpecBMOImpl.java
  39. 0 38
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/impl/SaveGroupBuyProductSpecBMOImpl.java
  40. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/impl/UpdateGroupBuyProductSpecBMOImpl.java
  41. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/IDeleteGroupBuySettingBMO.java
  42. 0 16
      service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/IGetGroupBuySettingBMO.java
  43. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/ISaveGroupBuySettingBMO.java
  44. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/IUpdateGroupBuySettingBMO.java
  45. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/impl/DeleteGroupBuySettingBMOImpl.java
  46. 0 44
      service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/impl/GetGroupBuySettingBMOImpl.java
  47. 0 59
      service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/impl/SaveGroupBuySettingBMOImpl.java
  48. 0 61
      service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/impl/UpdateGroupBuySettingBMOImpl.java
  49. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/product/IDeleteProductBMO.java
  50. 0 16
      service-goods/src/main/java/com/java110/goods/bmo/product/IGetProductBMO.java
  51. 0 24
      service-goods/src/main/java/com/java110/goods/bmo/product/ISaveProductBMO.java
  52. 0 23
      service-goods/src/main/java/com/java110/goods/bmo/product/IUpdateProductBMO.java
  53. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/product/impl/DeleteProductBMOImpl.java
  54. 0 209
      service-goods/src/main/java/com/java110/goods/bmo/product/impl/GetProductBMOImpl.java
  55. 0 120
      service-goods/src/main/java/com/java110/goods/bmo/product/impl/SaveProductBMOImpl.java
  56. 0 154
      service-goods/src/main/java/com/java110/goods/bmo/product/impl/UpdateProductBMOImpl.java
  57. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productAttr/IDeleteProductAttrBMO.java
  58. 0 16
      service-goods/src/main/java/com/java110/goods/bmo/productAttr/IGetProductAttrBMO.java
  59. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productAttr/ISaveProductAttrBMO.java
  60. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productAttr/IUpdateProductAttrBMO.java
  61. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/productAttr/impl/DeleteProductAttrBMOImpl.java
  62. 0 44
      service-goods/src/main/java/com/java110/goods/bmo/productAttr/impl/GetProductAttrBMOImpl.java
  63. 0 38
      service-goods/src/main/java/com/java110/goods/bmo/productAttr/impl/SaveProductAttrBMOImpl.java
  64. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/productAttr/impl/UpdateProductAttrBMOImpl.java
  65. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productCategory/IDeleteProductCategoryBMO.java
  66. 0 16
      service-goods/src/main/java/com/java110/goods/bmo/productCategory/IGetProductCategoryBMO.java
  67. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productCategory/ISaveProductCategoryBMO.java
  68. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productCategory/IUpdateProductCategoryBMO.java
  69. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/productCategory/impl/DeleteProductCategoryBMOImpl.java
  70. 0 44
      service-goods/src/main/java/com/java110/goods/bmo/productCategory/impl/GetProductCategoryBMOImpl.java
  71. 0 38
      service-goods/src/main/java/com/java110/goods/bmo/productCategory/impl/SaveProductCategoryBMOImpl.java
  72. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/productCategory/impl/UpdateProductCategoryBMOImpl.java
  73. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productDetail/IDeleteProductDetailBMO.java
  74. 0 16
      service-goods/src/main/java/com/java110/goods/bmo/productDetail/IGetProductDetailBMO.java
  75. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productDetail/ISaveProductDetailBMO.java
  76. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productDetail/IUpdateProductDetailBMO.java
  77. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/productDetail/impl/DeleteProductDetailBMOImpl.java
  78. 0 44
      service-goods/src/main/java/com/java110/goods/bmo/productDetail/impl/GetProductDetailBMOImpl.java
  79. 0 38
      service-goods/src/main/java/com/java110/goods/bmo/productDetail/impl/SaveProductDetailBMOImpl.java
  80. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/productDetail/impl/UpdateProductDetailBMOImpl.java
  81. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productLabel/IDeleteProductLabelBMO.java
  82. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/productLabel/IGetProductLabelBMO.java
  83. 0 19
      service-goods/src/main/java/com/java110/goods/bmo/productLabel/ISaveProductLabelBMO.java
  84. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productLabel/IUpdateProductLabelBMO.java
  85. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/productLabel/impl/DeleteProductLabelBMOImpl.java
  86. 0 128
      service-goods/src/main/java/com/java110/goods/bmo/productLabel/impl/GetProductLabelBMOImpl.java
  87. 0 38
      service-goods/src/main/java/com/java110/goods/bmo/productLabel/impl/SaveProductLabelBMOImpl.java
  88. 0 34
      service-goods/src/main/java/com/java110/goods/bmo/productLabel/impl/UpdateProductLabelBMOImpl.java
  89. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productSpec/IDeleteProductSpecBMO.java
  90. 0 16
      service-goods/src/main/java/com/java110/goods/bmo/productSpec/IGetProductSpecBMO.java
  91. 0 21
      service-goods/src/main/java/com/java110/goods/bmo/productSpec/ISaveProductSpecBMO.java
  92. 0 20
      service-goods/src/main/java/com/java110/goods/bmo/productSpec/IUpdateProductSpecBMO.java
  93. 0 48
      service-goods/src/main/java/com/java110/goods/bmo/productSpec/impl/DeleteProductSpecBMOImpl.java
  94. 0 75
      service-goods/src/main/java/com/java110/goods/bmo/productSpec/impl/GetProductSpecBMOImpl.java
  95. 0 57
      service-goods/src/main/java/com/java110/goods/bmo/productSpec/impl/SaveProductSpecBMOImpl.java
  96. 0 61
      service-goods/src/main/java/com/java110/goods/bmo/productSpec/impl/UpdateProductSpecBMOImpl.java
  97. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productSpecDetail/IDeleteProductSpecDetailBMO.java
  98. 0 16
      service-goods/src/main/java/com/java110/goods/bmo/productSpecDetail/IGetProductSpecDetailBMO.java
  99. 0 17
      service-goods/src/main/java/com/java110/goods/bmo/productSpecDetail/ISaveProductSpecDetailBMO.java
  100. 0 0
      service-goods/src/main/java/com/java110/goods/bmo/productSpecDetail/IUpdateProductSpecDetailBMO.java

+ 0 - 1
pom.xml

@@ -26,7 +26,6 @@
         <module>service-common</module>
         <module>service-report</module>
         <module>service-front</module>
-        <module>service-goods</module>
         <module>java110-generator</module>
         <module>service-acct</module>
 

+ 0 - 71
service-goods/pom.xml

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>MicroCommunity</artifactId>
-        <groupId>com.java110</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>service-goods</artifactId>
-
-    <name>service-goods</name>
-    <!-- FIXME change it to the project's website -->
-    <url>http://www.example.com</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.java110</groupId>
-            <artifactId>java110-service</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>service-goods</finalName>
-
-	        <plugins>
-	            <plugin>
-	                <groupId>org.apache.maven.plugins</groupId>
-	                <artifactId>maven-dependency-plugin</artifactId>
-	                <version>2.10</version>
-	                <executions>
-	                    <execution>
-	                        <id>unpack</id>
-	                        <phase>generate-resources</phase>
-	                        <goals>
-	                            <goal>unpack</goal>
-	                        </goals>
-	                        <configuration>
-	                            <artifactItems>
-	                                <artifactItem>
-	                                    <groupId>com.java110</groupId>
-	                                    <artifactId>java110-interface</artifactId>
-	                                    <version>${microcommunity.version}</version>
-	                                    <type>jar</type>
-	                                    <overWrite>true</overWrite>
-	                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
-	                                </artifactItem>
-	                            </artifactItems>
-	                        </configuration>
-	                    </execution>
-	                </executions>
-	            </plugin>
-	            <plugin>
-	                <groupId>org.springframework.boot</groupId>
-	                <artifactId>spring-boot-maven-plugin</artifactId>
-	                <configuration>
-	                    <mainClass>com.java110.goods.GoodsServiceApplicationStart</mainClass>
-	                </configuration>
-	            </plugin>
-	        </plugins>
-
-    </build>
-</project>

+ 0 - 68
service-goods/src/main/java/com/java110/goods/GoodsServiceApplicationStart.java

@@ -1,68 +0,0 @@
-package com.java110.goods;
-
-import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.client.RestTemplate;
-import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
-import com.java110.service.init.ServiceStartInit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.converter.StringHttpMessageConverter;
-
-import java.nio.charset.Charset;
-
-
-/**
- * spring boot 初始化启动类
- *
- * @version v0.1
- * @auther com.java110.wuxw
- * @mail 928255095@qq.com
- * @date 2016年8月6日
- * @tag
- */
-@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.goods",
-        "com.java110.core", "com.java110.config.properties.code", "com.java110.db"})
-@EnableDiscoveryClient
-@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
-        basePackages = {"com.java110.goods.listener"})
-@EnableFeignClients(basePackages = {"com.java110.intf.user",
-        "com.java110.intf.order",
-        "com.java110.intf.community",
-        "com.java110.intf.store",
-        "com.java110.intf.fee",
-        "com.java110.intf.common"})
-public class GoodsServiceApplicationStart {
-
-    private static Logger logger = LoggerFactory.getLogger(GoodsServiceApplicationStart.class);
-
-
-    /**
-     * 实例化RestTemplate,通过@LoadBalanced注解开启均衡负载能力.
-     *
-     * @return restTemplate
-     */
-    @Bean
-    @LoadBalanced
-    public RestTemplate restTemplate() {
-        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
-        return restTemplate;
-    }
-
-    public static void main(String[] args) throws Exception {
-        try {
-            ApplicationContext context = SpringApplication.run(GoodsServiceApplicationStart.class, args);
-            ServiceStartInit.initSystemConfig(context);
-        } catch (Throwable e) {
-            logger.error("系统启动失败", e);
-        }
-    }
-}

+ 0 - 559
service-goods/src/main/java/com/java110/goods/api/GroupBuyApi.java

@@ -1,559 +0,0 @@
-package com.java110.goods.api;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.groupBuy.GroupBuyDto;
-import com.java110.dto.groupBuyBatch.GroupBuyBatchDto;
-import com.java110.dto.groupBuyProduct.GroupBuyProductDto;
-import com.java110.dto.groupBuyProductSpec.GroupBuyProductSpecDto;
-import com.java110.dto.groupBuySetting.GroupBuySettingDto;
-import com.java110.goods.bmo.groupBuy.IDeleteGroupBuyBMO;
-import com.java110.goods.bmo.groupBuy.IGetGroupBuyBMO;
-import com.java110.goods.bmo.groupBuy.ISaveGroupBuyBMO;
-import com.java110.goods.bmo.groupBuy.IUpdateGroupBuyBMO;
-import com.java110.goods.bmo.groupBuyBatch.IDeleteGroupBuyBatchBMO;
-import com.java110.goods.bmo.groupBuyBatch.IGetGroupBuyBatchBMO;
-import com.java110.goods.bmo.groupBuyBatch.ISaveGroupBuyBatchBMO;
-import com.java110.goods.bmo.groupBuyBatch.IUpdateGroupBuyBatchBMO;
-import com.java110.goods.bmo.groupBuyProduct.IDeleteGroupBuyProductBMO;
-import com.java110.goods.bmo.groupBuyProduct.IGetGroupBuyProductBMO;
-import com.java110.goods.bmo.groupBuyProduct.ISaveGroupBuyProductBMO;
-import com.java110.goods.bmo.groupBuyProduct.IUpdateGroupBuyProductBMO;
-import com.java110.goods.bmo.groupBuyProductSpec.IDeleteGroupBuyProductSpecBMO;
-import com.java110.goods.bmo.groupBuyProductSpec.IGetGroupBuyProductSpecBMO;
-import com.java110.goods.bmo.groupBuyProductSpec.ISaveGroupBuyProductSpecBMO;
-import com.java110.goods.bmo.groupBuyProductSpec.IUpdateGroupBuyProductSpecBMO;
-import com.java110.goods.bmo.groupBuySetting.IDeleteGroupBuySettingBMO;
-import com.java110.goods.bmo.groupBuySetting.IGetGroupBuySettingBMO;
-import com.java110.goods.bmo.groupBuySetting.ISaveGroupBuySettingBMO;
-import com.java110.goods.bmo.groupBuySetting.IUpdateGroupBuySettingBMO;
-import com.java110.po.groupBuy.GroupBuyPo;
-import com.java110.po.groupBuyBatch.GroupBuyBatchPo;
-import com.java110.po.groupBuyProduct.GroupBuyProductPo;
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import com.java110.po.groupBuySetting.GroupBuySettingPo;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RestController
-@RequestMapping(value = "/groupBuy")
-public class GroupBuyApi {
-
-    @Autowired
-    private ISaveGroupBuyBMO saveGroupBuyBMOImpl;
-    @Autowired
-    private IUpdateGroupBuyBMO updateGroupBuyBMOImpl;
-    @Autowired
-    private IDeleteGroupBuyBMO deleteGroupBuyBMOImpl;
-
-    @Autowired
-    private IGetGroupBuyBMO getGroupBuyBMOImpl;
-
-
-    @Autowired
-    private ISaveGroupBuyProductBMO saveGroupBuyProductBMOImpl;
-    @Autowired
-    private IUpdateGroupBuyProductBMO updateGroupBuyProductBMOImpl;
-    @Autowired
-    private IDeleteGroupBuyProductBMO deleteGroupBuyProductBMOImpl;
-
-    @Autowired
-    private IGetGroupBuyProductBMO getGroupBuyProductBMOImpl;
-
-    @Autowired
-    private ISaveGroupBuySettingBMO saveGroupBuySettingBMOImpl;
-    @Autowired
-    private IUpdateGroupBuySettingBMO updateGroupBuySettingBMOImpl;
-    @Autowired
-    private IDeleteGroupBuySettingBMO deleteGroupBuySettingBMOImpl;
-
-    @Autowired
-    private IGetGroupBuySettingBMO getGroupBuySettingBMOImpl;
-
-
-    @Autowired
-    private ISaveGroupBuyProductSpecBMO saveGroupBuyProductSpecBMOImpl;
-    @Autowired
-    private IUpdateGroupBuyProductSpecBMO updateGroupBuyProductSpecBMOImpl;
-    @Autowired
-    private IDeleteGroupBuyProductSpecBMO deleteGroupBuyProductSpecBMOImpl;
-
-    @Autowired
-    private IGetGroupBuyProductSpecBMO getGroupBuyProductSpecBMOImpl;
-
-
-    @Autowired
-    private ISaveGroupBuyBatchBMO saveGroupBuyBatchBMOImpl;
-    @Autowired
-    private IUpdateGroupBuyBatchBMO updateGroupBuyBatchBMOImpl;
-    @Autowired
-    private IDeleteGroupBuyBatchBMO deleteGroupBuyBatchBMOImpl;
-
-    @Autowired
-    private IGetGroupBuyBatchBMO getGroupBuyBatchBMOImpl;
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/saveGroupBuy
-     * @path /app/groupBuy/saveGroupBuy
-     */
-    @RequestMapping(value = "/saveGroupBuy", method = RequestMethod.POST)
-    public ResponseEntity<String> saveGroupBuy(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "batchId", "请求报文中未包含batchId");
-        Assert.hasKeyAndValue(reqJson, "buyCount", "请求报文中未包含buyCount");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "specId", "请求报文中未包含specId");
-        Assert.hasKeyAndValue(reqJson, "persionId", "请求报文中未包含persionId");
-
-
-        GroupBuyPo groupBuyPo = BeanConvertUtil.covertBean(reqJson, GroupBuyPo.class);
-        return saveGroupBuyBMOImpl.save(groupBuyPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/updateGroupBuy
-     * @path /app/groupBuy/updateGroupBuy
-     */
-    @RequestMapping(value = "/updateGroupBuy", method = RequestMethod.POST)
-    public ResponseEntity<String> updateGroupBuy(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "batchId", "请求报文中未包含batchId");
-        Assert.hasKeyAndValue(reqJson, "buyCount", "请求报文中未包含buyCount");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "specId", "请求报文中未包含specId");
-        Assert.hasKeyAndValue(reqJson, "persionId", "请求报文中未包含persionId");
-        Assert.hasKeyAndValue(reqJson, "buyId", "buyId不能为空");
-
-
-        GroupBuyPo groupBuyPo = BeanConvertUtil.covertBean(reqJson, GroupBuyPo.class);
-        return updateGroupBuyBMOImpl.update(groupBuyPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/deleteGroupBuy
-     * @path /app/groupBuy/deleteGroupBuy
-     */
-    @RequestMapping(value = "/deleteGroupBuy", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteGroupBuy(@RequestBody JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "buyId", "buyId不能为空");
-
-
-        GroupBuyPo groupBuyPo = BeanConvertUtil.covertBean(reqJson, GroupBuyPo.class);
-        return deleteGroupBuyBMOImpl.delete(groupBuyPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 商户ID
-     * @return
-     * @serviceCode /groupBuy/queryGroupBuy
-     * @path /app/groupBuy/queryGroupBuy
-     */
-    @RequestMapping(value = "/queryGroupBuy", method = RequestMethod.GET)
-    public ResponseEntity<String> queryGroupBuy(@RequestHeader(value = "store-id") String storeId,
-                                                @RequestParam(value = "batchId", required = false) String batchId,
-                                                @RequestParam(value = "groupProdName", required = false) String groupProdName,
-                                                @RequestParam(value = "buyId", required = false) String buyId,
-                                                @RequestParam(value = "page") int page,
-                                                @RequestParam(value = "row") int row) {
-        GroupBuyDto groupBuyDto = new GroupBuyDto();
-        groupBuyDto.setPage(page);
-        groupBuyDto.setRow(row);
-        groupBuyDto.setStoreId(storeId);
-        groupBuyDto.setBatchId(batchId);
-        groupBuyDto.setGroupProdName(groupProdName);
-        groupBuyDto.setBuyId(buyId);
-        return getGroupBuyBMOImpl.get(groupBuyDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/saveGroupBuyProduct
-     * @path /app/groupBuy/saveGroupBuyProduct
-     */
-    @RequestMapping(value = "/saveGroupBuyProduct", method = RequestMethod.POST)
-    public ResponseEntity<String> saveGroupBuyProduct(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "groupProdName", "请求报文中未包含groupProdName");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "groupProdDesc", "请求报文中未包含groupProdDesc");
-        Assert.hasKeyAndValue(reqJson, "sort", "请求报文中未包含sort");
-
-        Assert.hasKey(reqJson, "productSpecs", "请求报文中未包含商品规格信息");
-
-        JSONArray productSpecs = reqJson.getJSONArray("productSpecs");
-
-        if (productSpecs.size() < 1) {
-            throw new IllegalArgumentException("请求报文中商品规格数量为0");
-        }
-        List<GroupBuyProductSpecPo> groupBuyProductSpecPos = new ArrayList<>();
-        GroupBuyProductSpecPo groupBuyProductSpecPo = null;
-        for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
-            groupBuyProductSpecPo = BeanConvertUtil.covertBean(productSpecs.getJSONObject(specIndex), GroupBuyProductSpecPo.class);
-            groupBuyProductSpecPo.setProductId(reqJson.getString("productId"));
-            groupBuyProductSpecPo.setDefaultShow("F");
-            groupBuyProductSpecPo.setGroupSales("1");
-            groupBuyProductSpecPo.setStoreId(storeId);
-            groupBuyProductSpecPos.add(groupBuyProductSpecPo);
-        }
-        GroupBuyProductPo groupBuyProductPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductPo.class);
-        groupBuyProductPo.setStoreId(storeId);
-        return saveGroupBuyProductBMOImpl.save(groupBuyProductPo, groupBuyProductSpecPos);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/updateGroupBuyProduct
-     * @path /app/groupBuy/updateGroupBuyProduct
-     */
-    @RequestMapping(value = "/updateGroupBuyProduct", method = RequestMethod.POST)
-    public ResponseEntity<String> updateGroupBuyProduct(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "groupProdName", "请求报文中未包含groupProdName");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "groupProdDesc", "请求报文中未包含groupProdDesc");
-        Assert.hasKeyAndValue(reqJson, "sort", "请求报文中未包含sort");
-        Assert.hasKeyAndValue(reqJson, "groupId", "groupId不能为空");
-
-        Assert.hasKey(reqJson, "productSpecs", "请求报文中未包含商品规格信息");
-
-        JSONArray productSpecs = reqJson.getJSONArray("productSpecs");
-
-        if (productSpecs.size() < 1) {
-            throw new IllegalArgumentException("请求报文中商品规格数量为0");
-        }
-        List<GroupBuyProductSpecPo> groupBuyProductSpecPos = new ArrayList<>();
-        GroupBuyProductSpecPo groupBuyProductSpecPo = null;
-        for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
-            groupBuyProductSpecPo = BeanConvertUtil.covertBean(productSpecs.getJSONObject(specIndex), GroupBuyProductSpecPo.class);
-            groupBuyProductSpecPo.setProductId(reqJson.getString("productId"));
-            groupBuyProductSpecPo.setDefaultShow("F");
-            groupBuyProductSpecPo.setGroupSales("1");
-            groupBuyProductSpecPo.setStoreId(storeId);
-            groupBuyProductSpecPos.add(groupBuyProductSpecPo);
-        }
-        GroupBuyProductPo groupBuyProductPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductPo.class);
-        groupBuyProductPo.setStoreId(storeId);
-        return updateGroupBuyProductBMOImpl.update(groupBuyProductPo, groupBuyProductSpecPos);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/deleteGroupBuyProduct
-     * @path /app/groupBuy/deleteGroupBuyProduct
-     */
-    @RequestMapping(value = "/deleteGroupBuyProduct", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteGroupBuyProduct(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "groupId", "groupId不能为空");
-
-
-        GroupBuyProductPo groupBuyProductPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductPo.class);
-        groupBuyProductPo.setStoreId(storeId);
-        return deleteGroupBuyProductBMOImpl.delete(groupBuyProductPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 商户
-     * @return
-     * @serviceCode /groupBuy/queryGroupBuyProduct
-     * @path /app/groupBuy/queryGroupBuyProduct
-     */
-    @RequestMapping(value = "/queryGroupBuyProduct", method = RequestMethod.GET)
-    public ResponseEntity<String> queryGroupBuyProduct(@RequestHeader(value = "store-id") String storeId,
-                                                       @RequestParam(value = "page") int page,
-                                                       @RequestParam(value = "row") int row,
-                                                       @RequestParam(value = "groupId", required = false) String groupId) {
-        GroupBuyProductDto groupBuyProductDto = new GroupBuyProductDto();
-        groupBuyProductDto.setPage(page);
-        groupBuyProductDto.setRow(row);
-        groupBuyProductDto.setStoreId(storeId);
-        groupBuyProductDto.setGroupId(groupId);
-        return getGroupBuyProductBMOImpl.get(groupBuyProductDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/saveGroupBuySetting
-     * @path /app/groupBuy/saveGroupBuySetting
-     */
-    @RequestMapping(value = "/saveGroupBuySetting", method = RequestMethod.POST)
-    public ResponseEntity<String> saveGroupBuySetting(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "groupBuyName", "请求报文中未包含groupBuyName");
-        Assert.hasKeyAndValue(reqJson, "validHours", "请求报文中未包含validHours");
-        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
-        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
-
-
-        GroupBuySettingPo groupBuySettingPo = BeanConvertUtil.covertBean(reqJson, GroupBuySettingPo.class);
-        groupBuySettingPo.setStoreId(storeId);
-        return saveGroupBuySettingBMOImpl.save(groupBuySettingPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/updateGroupBuySetting
-     * @path /app/groupBuy/updateGroupBuySetting
-     */
-    @RequestMapping(value = "/updateGroupBuySetting", method = RequestMethod.POST)
-    public ResponseEntity<String> updateGroupBuySetting(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "groupBuyName", "请求报文中未包含groupBuyName");
-        Assert.hasKeyAndValue(reqJson, "validHours", "请求报文中未包含validHours");
-        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
-        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
-        Assert.hasKeyAndValue(reqJson, "settingId", "settingId不能为空");
-
-
-        GroupBuySettingPo groupBuySettingPo = BeanConvertUtil.covertBean(reqJson, GroupBuySettingPo.class);
-        groupBuySettingPo.setStoreId(storeId);
-        return updateGroupBuySettingBMOImpl.update(groupBuySettingPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/deleteGroupBuySetting
-     * @path /app/groupBuy/deleteGroupBuySetting
-     */
-    @RequestMapping(value = "/deleteGroupBuySetting", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteGroupBuySetting(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "settingId", "settingId不能为空");
-
-
-        GroupBuySettingPo groupBuySettingPo = BeanConvertUtil.covertBean(reqJson, GroupBuySettingPo.class);
-        groupBuySettingPo.setStoreId(storeId);
-        return deleteGroupBuySettingBMOImpl.delete(groupBuySettingPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 商户ID
-     * @return
-     * @serviceCode /groupBuy/queryGroupBuySetting
-     * @path /app/groupBuy/queryGroupBuySetting
-     */
-    @RequestMapping(value = "/queryGroupBuySetting", method = RequestMethod.GET)
-    public ResponseEntity<String> queryGroupBuySetting(@RequestHeader(value = "store-id") String storeId,
-                                                       @RequestParam(value = "page") int page,
-                                                       @RequestParam(value = "row") int row) {
-        GroupBuySettingDto groupBuySettingDto = new GroupBuySettingDto();
-        groupBuySettingDto.setPage(page);
-        groupBuySettingDto.setRow(row);
-        groupBuySettingDto.setStoreId(storeId);
-        return getGroupBuySettingBMOImpl.get(groupBuySettingDto);
-    }
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/saveGroupBuyProductSpec
-     * @path /app/groupBuy/saveGroupBuyProductSpec
-     */
-    @RequestMapping(value = "/saveGroupBuyProductSpec", method = RequestMethod.POST)
-    public ResponseEntity<String> saveGroupBuyProductSpec(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "groupStock", "请求报文中未包含groupStock");
-        Assert.hasKeyAndValue(reqJson, "groupSales", "请求报文中未包含groupSales");
-        Assert.hasKeyAndValue(reqJson, "defaultShow", "请求报文中未包含defaultShow");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-
-
-        GroupBuyProductSpecPo groupBuyProductSpecPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductSpecPo.class);
-        return saveGroupBuyProductSpecBMOImpl.save(groupBuyProductSpecPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/updateGroupBuyProductSpec
-     * @path /app/groupBuy/updateGroupBuyProductSpec
-     */
-    @RequestMapping(value = "/updateGroupBuyProductSpec", method = RequestMethod.POST)
-    public ResponseEntity<String> updateGroupBuyProductSpec(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "groupStock", "请求报文中未包含groupStock");
-        Assert.hasKeyAndValue(reqJson, "groupSales", "请求报文中未包含groupSales");
-        Assert.hasKeyAndValue(reqJson, "defaultShow", "请求报文中未包含defaultShow");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "specId", "specId不能为空");
-
-
-        GroupBuyProductSpecPo groupBuyProductSpecPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductSpecPo.class);
-        return updateGroupBuyProductSpecBMOImpl.update(groupBuyProductSpecPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/deleteGroupBuyProductSpec
-     * @path /app/groupBuy/deleteGroupBuyProductSpec
-     */
-    @RequestMapping(value = "/deleteGroupBuyProductSpec", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteGroupBuyProductSpec(@RequestBody JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "specId", "specId不能为空");
-
-
-        GroupBuyProductSpecPo groupBuyProductSpecPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductSpecPo.class);
-        return deleteGroupBuyProductSpecBMOImpl.delete(groupBuyProductSpecPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 小区ID
-     * @return
-     * @serviceCode /groupBuy/queryGroupBuyProductSpec
-     * @path /app/groupBuy/queryGroupBuyProductSpec
-     */
-    @RequestMapping(value = "/queryGroupBuyProductSpec", method = RequestMethod.GET)
-    public ResponseEntity<String> queryGroupBuyProductSpec(@RequestHeader(value = "store-id") String storeId,
-                                                           @RequestParam(value = "page") int page,
-                                                           @RequestParam(value = "row") int row) {
-        GroupBuyProductSpecDto groupBuyProductSpecDto = new GroupBuyProductSpecDto();
-        groupBuyProductSpecDto.setPage(page);
-        groupBuyProductSpecDto.setRow(row);
-        groupBuyProductSpecDto.setStoreId(storeId);
-        return getGroupBuyProductSpecBMOImpl.get(groupBuyProductSpecDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/saveGroupBuyBatch
-     * @path /app/groupBuy/saveGroupBuyBatch
-     */
-    @RequestMapping(value = "/saveGroupBuyBatch", method = RequestMethod.POST)
-    public ResponseEntity<String> saveGroupBuyBatch(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "settingId", "请求报文中未包含settingId");
-        Assert.hasKeyAndValue(reqJson, "batchStartTime", "请求报文中未包含batchStartTime");
-        Assert.hasKeyAndValue(reqJson, "batchEndTime", "请求报文中未包含batchEndTime");
-
-
-        GroupBuyBatchPo groupBuyBatchPo = BeanConvertUtil.covertBean(reqJson, GroupBuyBatchPo.class);
-        groupBuyBatchPo.setStoreId(storeId);
-        return saveGroupBuyBatchBMOImpl.save(groupBuyBatchPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/updateGroupBuyBatch
-     * @path /app/groupBuy/updateGroupBuyBatch
-     */
-    @RequestMapping(value = "/updateGroupBuyBatch", method = RequestMethod.POST)
-    public ResponseEntity<String> updateGroupBuyBatch(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "settingId", "请求报文中未包含settingId");
-        Assert.hasKeyAndValue(reqJson, "batchStartTime", "请求报文中未包含batchStartTime");
-        Assert.hasKeyAndValue(reqJson, "batchEndTime", "请求报文中未包含batchEndTime");
-        Assert.hasKeyAndValue(reqJson, "batchId", "batchId不能为空");
-
-
-        GroupBuyBatchPo groupBuyBatchPo = BeanConvertUtil.covertBean(reqJson, GroupBuyBatchPo.class);
-        groupBuyBatchPo.setStoreId(storeId);
-        return updateGroupBuyBatchBMOImpl.update(groupBuyBatchPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /groupBuy/deleteGroupBuyBatch
-     * @path /app/groupBuy/deleteGroupBuyBatch
-     */
-    @RequestMapping(value = "/deleteGroupBuyBatch", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteGroupBuyBatch(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "batchId", "batchId不能为空");
-
-
-        GroupBuyBatchPo groupBuyBatchPo = BeanConvertUtil.covertBean(reqJson, GroupBuyBatchPo.class);
-        groupBuyBatchPo.setStoreId(storeId);
-        return deleteGroupBuyBatchBMOImpl.delete(groupBuyBatchPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 小区ID
-     * @return
-     * @serviceCode /groupBuy/queryGroupBuyBatch
-     * @path /app/groupBuy/queryGroupBuyBatch
-     */
-    @RequestMapping(value = "/queryGroupBuyBatch", method = RequestMethod.GET)
-    public ResponseEntity<String> queryGroupBuyBatch(@RequestHeader(value = "store-id") String storeId,
-                                                     @RequestParam(value = "batchId", required = false) String batchId,
-                                                     @RequestParam(value = "page") int page,
-                                                     @RequestParam(value = "row") int row) {
-        GroupBuyBatchDto groupBuyBatchDto = new GroupBuyBatchDto();
-        groupBuyBatchDto.setPage(page);
-        groupBuyBatchDto.setRow(row);
-        groupBuyBatchDto.setStoreId(storeId);
-        groupBuyBatchDto.setBatchId(batchId);
-        return getGroupBuyBatchBMOImpl.get(groupBuyBatchDto);
-    }
-}

+ 0 - 851
service-goods/src/main/java/com/java110/goods/api/ProductApi.java

@@ -1,851 +0,0 @@
-package com.java110.goods.api;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.product.ProductDto;
-import com.java110.dto.product.ProductSpecDetailDto;
-import com.java110.dto.product.ProductSpecDto;
-import com.java110.dto.productAttr.ProductAttrDto;
-import com.java110.dto.productDetail.ProductDetailDto;
-import com.java110.dto.productLabel.ProductLabelDto;
-import com.java110.dto.productSpecValue.ProductSpecValueDto;
-import com.java110.goods.bmo.product.IDeleteProductBMO;
-import com.java110.goods.bmo.product.IGetProductBMO;
-import com.java110.goods.bmo.product.ISaveProductBMO;
-import com.java110.goods.bmo.product.IUpdateProductBMO;
-import com.java110.goods.bmo.productAttr.IDeleteProductAttrBMO;
-import com.java110.goods.bmo.productAttr.IGetProductAttrBMO;
-import com.java110.goods.bmo.productAttr.ISaveProductAttrBMO;
-import com.java110.goods.bmo.productAttr.IUpdateProductAttrBMO;
-import com.java110.goods.bmo.productDetail.IDeleteProductDetailBMO;
-import com.java110.goods.bmo.productDetail.IGetProductDetailBMO;
-import com.java110.goods.bmo.productDetail.ISaveProductDetailBMO;
-import com.java110.goods.bmo.productDetail.IUpdateProductDetailBMO;
-import com.java110.goods.bmo.productLabel.IDeleteProductLabelBMO;
-import com.java110.goods.bmo.productLabel.IGetProductLabelBMO;
-import com.java110.goods.bmo.productLabel.ISaveProductLabelBMO;
-import com.java110.goods.bmo.productLabel.IUpdateProductLabelBMO;
-import com.java110.goods.bmo.productSpec.IDeleteProductSpecBMO;
-import com.java110.goods.bmo.productSpec.IGetProductSpecBMO;
-import com.java110.goods.bmo.productSpec.ISaveProductSpecBMO;
-import com.java110.goods.bmo.productSpec.IUpdateProductSpecBMO;
-import com.java110.goods.bmo.productSpecDetail.IDeleteProductSpecDetailBMO;
-import com.java110.goods.bmo.productSpecDetail.IGetProductSpecDetailBMO;
-import com.java110.goods.bmo.productSpecDetail.ISaveProductSpecDetailBMO;
-import com.java110.goods.bmo.productSpecDetail.IUpdateProductSpecDetailBMO;
-import com.java110.goods.bmo.productSpecValue.IDeleteProductSpecValueBMO;
-import com.java110.goods.bmo.productSpecValue.IGetProductSpecValueBMO;
-import com.java110.goods.bmo.productSpecValue.ISaveProductSpecValueBMO;
-import com.java110.goods.bmo.productSpecValue.IUpdateProductSpecValueBMO;
-import com.java110.po.product.ProductPo;
-import com.java110.po.product.ProductSpecDetailPo;
-import com.java110.po.product.ProductSpecPo;
-import com.java110.po.productAttr.ProductAttrPo;
-import com.java110.po.productDetail.ProductDetailPo;
-import com.java110.po.productLabel.ProductLabelPo;
-import com.java110.po.productSpecValue.ProductSpecValuePo;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@RestController
-@RequestMapping(value = "/product")
-public class ProductApi {
-
-    @Autowired
-    private ISaveProductLabelBMO saveProductLabelBMOImpl;
-    @Autowired
-    private IUpdateProductLabelBMO updateProductLabelBMOImpl;
-    @Autowired
-    private IDeleteProductLabelBMO deleteProductLabelBMOImpl;
-
-    @Autowired
-    private IGetProductLabelBMO getProductLabelBMOImpl;
-
-    @Autowired
-    private ISaveProductBMO saveProductBMOImpl;
-    @Autowired
-    private IUpdateProductBMO updateProductBMOImpl;
-    @Autowired
-    private IDeleteProductBMO deleteProductBMOImpl;
-
-    @Autowired
-    private IGetProductBMO getProductBMOImpl;
-
-    @Autowired
-    private ISaveProductSpecBMO saveProductSpecBMOImpl;
-    @Autowired
-    private IUpdateProductSpecBMO updateProductSpecBMOImpl;
-    @Autowired
-    private IDeleteProductSpecBMO deleteProductSpecBMOImpl;
-
-    @Autowired
-    private IGetProductSpecBMO getProductSpecBMOImpl;
-
-    @Autowired
-    private ISaveProductSpecDetailBMO saveProductSpecDetailBMOImpl;
-    @Autowired
-    private IUpdateProductSpecDetailBMO updateProductSpecDetailBMOImpl;
-    @Autowired
-    private IDeleteProductSpecDetailBMO deleteProductSpecDetailBMOImpl;
-
-    @Autowired
-    private IGetProductSpecDetailBMO getProductSpecDetailBMOImpl;
-
-    @Autowired
-    private ISaveProductSpecValueBMO saveProductSpecValueBMOImpl;
-    @Autowired
-    private IUpdateProductSpecValueBMO updateProductSpecValueBMOImpl;
-    @Autowired
-    private IDeleteProductSpecValueBMO deleteProductSpecValueBMOImpl;
-
-    @Autowired
-    private IGetProductSpecValueBMO getProductSpecValueBMOImpl;
-
-    @Autowired
-    private ISaveProductAttrBMO saveProductAttrBMOImpl;
-    @Autowired
-    private IUpdateProductAttrBMO updateProductAttrBMOImpl;
-    @Autowired
-    private IDeleteProductAttrBMO deleteProductAttrBMOImpl;
-
-    @Autowired
-    private IGetProductAttrBMO getProductAttrBMOImpl;
-
-
-    @Autowired
-    private ISaveProductDetailBMO saveProductDetailBMOImpl;
-    @Autowired
-    private IUpdateProductDetailBMO updateProductDetailBMOImpl;
-    @Autowired
-    private IDeleteProductDetailBMO deleteProductDetailBMOImpl;
-
-    @Autowired
-    private IGetProductDetailBMO getProductDetailBMOImpl;
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/saveProduct
-     * @path /app/product/saveProduct
-     */
-    @RequestMapping(value = "/saveProduct", method = RequestMethod.POST)
-    public ResponseEntity<String> saveProduct(@RequestBody JSONObject reqJson,
-                                              @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "prodName", "请求报文中未包含prodName");
-        Assert.hasKeyAndValue(reqJson, "keyword", "请求报文中未包含keyword");
-        Assert.hasKeyAndValue(reqJson, "categoryId", "请求报文中未包含categoryId");
-        Assert.hasKeyAndValue(reqJson, "unitName", "请求报文中未包含unitName");
-        Assert.hasKeyAndValue(reqJson, "sort", "请求报文中未包含sort");
-        Assert.hasKeyAndValue(reqJson, "isPostage", "请求报文中未包含isPostage");
-        Assert.hasKeyAndValue(reqJson, "coverPhoto", "请求报文中未包含商品封面");
-        Assert.hasKeyAndValue(reqJson, "content", "请求报文中未包含商品描述");
-
-        Assert.hasKey(reqJson, "carouselFigurePhoto", "请求报文中未包含轮播图");
-        Assert.hasKey(reqJson, "productSpecs", "请求报文中未包含规格信息");
-
-
-        String coverPhoto = reqJson.getString("coverPhoto");
-        JSONArray carouselFigurePhoto = reqJson.getJSONArray("carouselFigurePhoto");
-
-        JSONArray productSpecs = reqJson.getJSONArray("productSpecs");
-
-        if (carouselFigurePhoto.size() < 1) {
-            throw new IllegalArgumentException("请求报文中未包含轮播图");
-        }
-        if (productSpecs.size() < 1) {
-            throw new IllegalArgumentException("请求报文中未包含规格信息");
-        }
-
-        JSONObject spec = null;
-        List<ProductSpecValuePo> productSpecValuePos = new ArrayList<>();
-        boolean hasDefault = false;
-        ProductSpecValuePo productSpecValuePo = null;
-        for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
-            spec = productSpecs.getJSONObject(specIndex);
-            productSpecValuePo = BeanConvertUtil.covertBean(spec, ProductSpecValuePo.class);
-            productSpecValuePos.add(productSpecValuePo);
-            if("T".equals(productSpecValuePo.getIsDefault())){
-                hasDefault = true;
-            }
-        }
-
-        if(!hasDefault){
-            throw new IllegalArgumentException("请求报文中未包含默认规格");
-        }
-
-        ProductPo productPo = BeanConvertUtil.covertBean(reqJson, ProductPo.class);
-        productPo.setStoreId(storeId);
-
-        ProductDetailPo productDetailPo = new ProductDetailPo();
-        productDetailPo.setStoreId(storeId);
-        productDetailPo.setContent(reqJson.getString("content"));
-        return saveProductBMOImpl.save(productPo, coverPhoto, carouselFigurePhoto, productSpecValuePos, productDetailPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/updateProduct
-     * @path /app/product/updateProduct
-     */
-    @RequestMapping(value = "/updateProduct", method = RequestMethod.POST)
-    public ResponseEntity<String> updateProduct(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "prodName", "请求报文中未包含prodName");
-        Assert.hasKeyAndValue(reqJson, "keyword", "请求报文中未包含keyword");
-        Assert.hasKeyAndValue(reqJson, "categoryId", "请求报文中未包含categoryId");
-        Assert.hasKeyAndValue(reqJson, "unitName", "请求报文中未包含unitName");
-        Assert.hasKeyAndValue(reqJson, "sort", "请求报文中未包含sort");
-        Assert.hasKeyAndValue(reqJson, "isPostage", "请求报文中未包含isPostage");
-        Assert.hasKeyAndValue(reqJson, "productId", "productId不能为空");
-
-        String coverPhoto = reqJson.containsKey("coverPhoto") ? reqJson.getString("coverPhoto") : "";
-        JSONArray carouselFigurePhoto = reqJson.containsKey("carouselFigurePhoto") ? reqJson.getJSONArray("carouselFigurePhoto") : null;
-
-        JSONArray productSpecs = reqJson.containsKey("productSpecs") ? reqJson.getJSONArray("productSpecs") : null;
-
-        JSONObject spec = null;
-        List<ProductSpecValuePo> productSpecValuePos = null;
-
-        boolean hasDefault = false;
-        ProductSpecValuePo productSpecValuePo = null;
-        if (productSpecs != null) {
-            productSpecValuePos = new ArrayList<>();
-            for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
-                spec = productSpecs.getJSONObject(specIndex);
-                productSpecValuePo = BeanConvertUtil.covertBean(spec, ProductSpecValuePo.class);
-                productSpecValuePos.add(productSpecValuePo);
-                if("T".equals(productSpecValuePo.getIsDefault())){
-                    hasDefault = true;
-                }
-            }
-        }
-
-        if(!hasDefault){
-            throw new IllegalArgumentException("请求报文中未包含默认规格");
-        }
-
-        ProductPo productPo = BeanConvertUtil.covertBean(reqJson, ProductPo.class);
-        productPo.setStoreId(storeId);
-
-
-        ProductDetailPo productDetailPo = null;
-        if (reqJson.containsKey("content")) {
-            productDetailPo = new ProductDetailPo();
-            productDetailPo.setStoreId(storeId);
-            productDetailPo.setContent(reqJson.getString("content"));
-        }
-
-        return updateProductBMOImpl.update(productPo, coverPhoto, carouselFigurePhoto, productSpecValuePos, productDetailPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/deleteProduct
-     * @path /app/product/deleteProduct
-     */
-    @RequestMapping(value = "/deleteProduct", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteProduct(@RequestBody JSONObject reqJson,
-                                                @RequestHeader(value = "store-id") String storeId) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "productId", "productId不能为空");
-
-
-        ProductPo productPo = BeanConvertUtil.covertBean(reqJson, ProductPo.class);
-        productPo.setStoreId(storeId);
-        return deleteProductBMOImpl.delete(productPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 商户ID
-     * @return
-     * @serviceCode /product/queryProduct
-     * @path /app/product/queryProduct
-     */
-    @RequestMapping(value = "/queryProduct", method = RequestMethod.GET)
-    public ResponseEntity<String> queryProduct(@RequestHeader(value = "store-id") String storeId,
-                                               @RequestParam(value = "productId", required = false) String productId,
-                                               @RequestParam(value = "page") int page,
-                                               @RequestParam(value = "row") int row) {
-        ProductDto productDto = new ProductDto();
-        productDto.setPage(page);
-        productDto.setRow(row);
-        productDto.setStoreId(storeId);
-        productDto.setProductId(productId);
-        return getProductBMOImpl.get(productDto);
-    }
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/saveProductSpec
-     * @path /app/product/saveProductSpec
-     */
-    @RequestMapping(value = "/saveProductSpec", method = RequestMethod.POST)
-    public ResponseEntity<String> saveProductSpec(@RequestBody JSONObject reqJson,
-                                                  @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "specName", "请求报文中未包含specName");
-
-        if (!reqJson.containsKey("specDetails")) {
-            throw new IllegalArgumentException("未包含规格信息");
-        }
-
-        JSONArray specDetails = reqJson.getJSONArray("specDetails");
-
-        if (specDetails.size() < 1) {
-            throw new IllegalArgumentException("未包含规格信息");
-        }
-        ProductSpecDetailPo productSpecDetailPo = null;
-        JSONObject specDetail = null;
-        List<ProductSpecDetailPo> productSpecDetailPos = new ArrayList<>();
-        for (int detailIndex = 0; detailIndex < specDetails.size(); detailIndex++) {
-            specDetail = specDetails.getJSONObject(detailIndex);
-            Assert.hasKeyAndValue(specDetail, "detailName", "未包含规格");
-            Assert.hasKeyAndValue(specDetail, "detailValue", "未包含规格值");
-            productSpecDetailPo = BeanConvertUtil.covertBean(specDetail, ProductSpecDetailPo.class);
-            productSpecDetailPos.add(productSpecDetailPo);
-        }
-
-
-        ProductSpecPo productSpecPo = BeanConvertUtil.covertBean(reqJson, ProductSpecPo.class);
-        productSpecPo.setStoreId(storeId);
-        return saveProductSpecBMOImpl.save(productSpecPo, productSpecDetailPos);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/updateProductSpec
-     * @path /app/product/updateProductSpec
-     */
-    @RequestMapping(value = "/updateProductSpec", method = RequestMethod.POST)
-    public ResponseEntity<String> updateProductSpec(@RequestBody JSONObject reqJson,
-                                                    @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "specName", "请求报文中未包含specName");
-        Assert.hasKeyAndValue(reqJson, "specId", "specId不能为空");
-
-
-        if (!reqJson.containsKey("specDetails")) {
-            throw new IllegalArgumentException("未包含规格信息");
-        }
-
-        JSONArray specDetails = reqJson.getJSONArray("specDetails");
-
-        if (specDetails.size() < 1) {
-            throw new IllegalArgumentException("未包含规格信息");
-        }
-        ProductSpecDetailPo productSpecDetailPo = null;
-        JSONObject specDetail = null;
-        List<ProductSpecDetailPo> productSpecDetailPos = new ArrayList<>();
-        for (int detailIndex = 0; detailIndex < specDetails.size(); detailIndex++) {
-            specDetail = specDetails.getJSONObject(detailIndex);
-            Assert.hasKeyAndValue(specDetail, "detailName", "未包含规格");
-            Assert.hasKeyAndValue(specDetail, "detailValue", "未包含规格值");
-            productSpecDetailPo = BeanConvertUtil.covertBean(specDetail, ProductSpecDetailPo.class);
-            productSpecDetailPos.add(productSpecDetailPo);
-        }
-
-        ProductSpecPo productSpecPo = BeanConvertUtil.covertBean(reqJson, ProductSpecPo.class);
-        productSpecPo.setStoreId(storeId);
-        return updateProductSpecBMOImpl.update(productSpecPo, productSpecDetailPos);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/deleteProductSpec
-     * @path /app/product/deleteProductSpec
-     */
-    @RequestMapping(value = "/deleteProductSpec", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteProductSpec(@RequestBody JSONObject reqJson,
-                                                    @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "specId", "specId不能为空");
-
-
-        ProductSpecPo productSpecPo = BeanConvertUtil.covertBean(reqJson, ProductSpecPo.class);
-        productSpecPo.setStoreId(storeId);
-        return deleteProductSpecBMOImpl.delete(productSpecPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 商户ID
-     * @return
-     * @serviceCode /product/queryProductSpec
-     * @path /app/product/queryProductSpec
-     */
-    @RequestMapping(value = "/queryProductSpec", method = RequestMethod.GET)
-    public ResponseEntity<String> queryProductSpec(@RequestHeader(value = "store-id") String storeId,
-                                                   @RequestParam(value = "page") int page,
-                                                   @RequestParam(value = "row") int row) {
-        ProductSpecDto productSpecDto = new ProductSpecDto();
-        productSpecDto.setPage(page);
-        productSpecDto.setRow(row);
-        productSpecDto.setStoreId(storeId);
-        return getProductSpecBMOImpl.get(productSpecDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/saveProductSpecDetail
-     * @path /app/product/saveProductSpecDetail
-     */
-    @RequestMapping(value = "/saveProductSpecDetail", method = RequestMethod.POST)
-    public ResponseEntity<String> saveProductSpecDetail(@RequestBody JSONObject reqJson,
-                                                        @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "specId", "请求报文中未包含specId");
-        Assert.hasKeyAndValue(reqJson, "detailName", "请求报文中未包含detailName");
-        Assert.hasKeyAndValue(reqJson, "detailValue", "请求报文中未包含detailValue");
-
-
-        ProductSpecDetailPo productSpecDetailPo = BeanConvertUtil.covertBean(reqJson, ProductSpecDetailPo.class);
-        productSpecDetailPo.setStoreId(storeId);
-        return saveProductSpecDetailBMOImpl.save(productSpecDetailPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/updateProductSpecDetail
-     * @path /app/product/updateProductSpecDetail
-     */
-    @RequestMapping(value = "/updateProductSpecDetail", method = RequestMethod.POST)
-    public ResponseEntity<String> updateProductSpecDetail(@RequestBody JSONObject reqJson,
-                                                          @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "specId", "请求报文中未包含specId");
-        Assert.hasKeyAndValue(reqJson, "detailName", "请求报文中未包含detailName");
-        Assert.hasKeyAndValue(reqJson, "detailValue", "请求报文中未包含detailValue");
-        Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");
-
-
-        ProductSpecDetailPo productSpecDetailPo = BeanConvertUtil.covertBean(reqJson, ProductSpecDetailPo.class);
-        productSpecDetailPo.setStoreId(storeId);
-        return updateProductSpecDetailBMOImpl.update(productSpecDetailPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/deleteProductSpecDetail
-     * @path /app/product/deleteProductSpecDetail
-     */
-    @RequestMapping(value = "/deleteProductSpecDetail", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteProductSpecDetail(@RequestBody JSONObject reqJson,
-                                                          @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");
-
-
-        ProductSpecDetailPo productSpecDetailPo = BeanConvertUtil.covertBean(reqJson, ProductSpecDetailPo.class);
-        productSpecDetailPo.setStoreId(storeId);
-        return deleteProductSpecDetailBMOImpl.delete(productSpecDetailPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 小区ID
-     * @return
-     * @serviceCode /product/queryProductSpecDetail
-     * @path /app/product/queryProductSpecDetail
-     */
-    @RequestMapping(value = "/queryProductSpecDetail", method = RequestMethod.GET)
-    public ResponseEntity<String> queryProductSpecDetail(@RequestHeader(value = "store-id") String storeId,
-                                                         @RequestParam(value = "specId", required = false) String specId,
-                                                         @RequestParam(value = "page") int page,
-                                                         @RequestParam(value = "row") int row) {
-        ProductSpecDetailDto productSpecDetailDto = new ProductSpecDetailDto();
-        productSpecDetailDto.setPage(page);
-        productSpecDetailDto.setRow(row);
-        productSpecDetailDto.setSpecId(specId);
-        productSpecDetailDto.setStoreId(storeId);
-        return getProductSpecDetailBMOImpl.get(productSpecDetailDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/saveProductSpecValue
-     * @path /app/product/saveProductSpecValue
-     */
-    @RequestMapping(value = "/saveProductSpecValue", method = RequestMethod.POST)
-    public ResponseEntity<String> saveProductSpecValue(@RequestBody JSONObject reqJson,
-                                                       @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "specId", "请求报文中未包含specId");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "stock", "请求报文中未包含stock");
-        Assert.hasKeyAndValue(reqJson, "price", "请求报文中未包含price");
-        Assert.hasKeyAndValue(reqJson, "sales", "请求报文中未包含sales");
-        Assert.hasKeyAndValue(reqJson, "costPrice", "请求报文中未包含costPrice");
-        Assert.hasKeyAndValue(reqJson, "vipPrice", "请求报文中未包含vipPrice");
-        Assert.hasKeyAndValue(reqJson, "otPrice", "请求报文中未包含otPrice");
-
-
-        ProductSpecValuePo productSpecValuePo = BeanConvertUtil.covertBean(reqJson, ProductSpecValuePo.class);
-        productSpecValuePo.setStoreId(storeId);
-        return saveProductSpecValueBMOImpl.save(productSpecValuePo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/updateProductSpecValue
-     * @path /app/product/updateProductSpecValue
-     */
-    @RequestMapping(value = "/updateProductSpecValue", method = RequestMethod.POST)
-    public ResponseEntity<String> updateProductSpecValue(@RequestBody JSONObject reqJson,
-                                                         @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "specId", "请求报文中未包含specId");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "stock", "请求报文中未包含stock");
-        Assert.hasKeyAndValue(reqJson, "price", "请求报文中未包含price");
-        Assert.hasKeyAndValue(reqJson, "sales", "请求报文中未包含sales");
-        Assert.hasKeyAndValue(reqJson, "costPrice", "请求报文中未包含costPrice");
-        Assert.hasKeyAndValue(reqJson, "vipPrice", "请求报文中未包含vipPrice");
-        Assert.hasKeyAndValue(reqJson, "otPrice", "请求报文中未包含otPrice");
-        Assert.hasKeyAndValue(reqJson, "valueId", "valueId不能为空");
-
-
-        ProductSpecValuePo productSpecValuePo = BeanConvertUtil.covertBean(reqJson, ProductSpecValuePo.class);
-        productSpecValuePo.setStoreId(storeId);
-        return updateProductSpecValueBMOImpl.update(productSpecValuePo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/deleteProductSpecValue
-     * @path /app/product/deleteProductSpecValue
-     */
-    @RequestMapping(value = "/deleteProductSpecValue", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteProductSpecValue(@RequestBody JSONObject reqJson,
-                                                         @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "valueId", "valueId不能为空");
-
-
-        ProductSpecValuePo productSpecValuePo = BeanConvertUtil.covertBean(reqJson, ProductSpecValuePo.class);
-        productSpecValuePo.setStoreId(storeId);
-        return deleteProductSpecValueBMOImpl.delete(productSpecValuePo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 小区ID
-     * @return
-     * @serviceCode /product/queryProductSpecValue
-     * @path /app/product/queryProductSpecValue
-     */
-    @RequestMapping(value = "/queryProductSpecValue", method = RequestMethod.GET)
-    public ResponseEntity<String> queryProductSpecValue(@RequestHeader(value = "store-id") String storeId,
-                                                        @RequestParam(value = "productId", required = false) String productId,
-                                                        @RequestParam(value = "page") int page,
-                                                        @RequestParam(value = "row") int row) {
-        ProductSpecValueDto productSpecValueDto = new ProductSpecValueDto();
-        productSpecValueDto.setPage(page);
-        productSpecValueDto.setRow(row);
-        productSpecValueDto.setStoreId(storeId);
-        productSpecValueDto.setProductId(productId);
-        return getProductSpecValueBMOImpl.get(productSpecValueDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/saveProductAttr
-     * @path /app/product/saveProductAttr
-     */
-    @RequestMapping(value = "/saveProductAttr", method = RequestMethod.POST)
-    public ResponseEntity<String> saveProductAttr(@RequestBody JSONObject reqJson,
-                                                  @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
-
-
-        ProductAttrPo productAttrPo = BeanConvertUtil.covertBean(reqJson, ProductAttrPo.class);
-        productAttrPo.setStoreId(storeId);
-        return saveProductAttrBMOImpl.save(productAttrPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/updateProductAttr
-     * @path /app/product/updateProductAttr
-     */
-    @RequestMapping(value = "/updateProductAttr", method = RequestMethod.POST)
-    public ResponseEntity<String> updateProductAttr(@RequestBody JSONObject reqJson,
-                                                    @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-
-
-        ProductAttrPo productAttrPo = BeanConvertUtil.covertBean(reqJson, ProductAttrPo.class);
-        productAttrPo.setStoreId(storeId);
-        return updateProductAttrBMOImpl.update(productAttrPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/deleteProductAttr
-     * @path /app/product/deleteProductAttr
-     */
-    @RequestMapping(value = "/deleteProductAttr", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteProductAttr(@RequestBody JSONObject reqJson,
-                                                    @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-
-
-        ProductAttrPo productAttrPo = BeanConvertUtil.covertBean(reqJson, ProductAttrPo.class);
-        productAttrPo.setStoreId(storeId);
-        return deleteProductAttrBMOImpl.delete(productAttrPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 商户ID
-     * @return
-     * @serviceCode /product/queryProductAttr
-     * @path /app/product/queryProductAttr
-     */
-    @RequestMapping(value = "/queryProductAttr", method = RequestMethod.GET)
-    public ResponseEntity<String> queryProductAttr(@RequestHeader(value = "store-id") String storeId,
-                                                   @RequestParam(value = "productId", required = false) String productId,
-                                                   @RequestParam(value = "page") int page,
-                                                   @RequestParam(value = "row") int row) {
-        ProductAttrDto productAttrDto = new ProductAttrDto();
-        productAttrDto.setPage(page);
-        productAttrDto.setRow(row);
-        productAttrDto.setStoreId(storeId);
-        productAttrDto.setProductId(productId);
-        return getProductAttrBMOImpl.get(productAttrDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/saveProductDetail
-     * @path /app/product/saveProductDetail
-     */
-    @RequestMapping(value = "/saveProductDetail", method = RequestMethod.POST)
-    public ResponseEntity<String> saveProductDetail(@RequestBody JSONObject reqJson,
-                                                    @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
-        Assert.hasKeyAndValue(reqJson, "content", "请求报文中未包含content");
-
-
-        ProductDetailPo productDetailPo = BeanConvertUtil.covertBean(reqJson, ProductDetailPo.class);
-        productDetailPo.setStoreId(storeId);
-        return saveProductDetailBMOImpl.save(productDetailPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/updateProductDetail
-     * @path /app/product/updateProductDetail
-     */
-    @RequestMapping(value = "/updateProductDetail", method = RequestMethod.POST)
-    public ResponseEntity<String> updateProductDetail(@RequestBody JSONObject reqJson,
-                                                      @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
-        Assert.hasKeyAndValue(reqJson, "content", "请求报文中未包含content");
-        Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");
-
-
-        ProductDetailPo productDetailPo = BeanConvertUtil.covertBean(reqJson, ProductDetailPo.class);
-        productDetailPo.setStoreId(storeId);
-        return updateProductDetailBMOImpl.update(productDetailPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/deleteProductDetail
-     * @path /app/product/deleteProductDetail
-     */
-    @RequestMapping(value = "/deleteProductDetail", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteProductDetail(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");
-
-
-        ProductDetailPo productDetailPo = BeanConvertUtil.covertBean(reqJson, ProductDetailPo.class);
-        productDetailPo.setStoreId(storeId);
-        return deleteProductDetailBMOImpl.delete(productDetailPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 小区ID
-     * @return
-     * @serviceCode /product/queryProductDetail
-     * @path /app/product/queryProductDetail
-     */
-    @RequestMapping(value = "/queryProductDetail", method = RequestMethod.GET)
-    public ResponseEntity<String> queryProductDetail(@RequestHeader(value = "store-id") String storeId,
-                                                     @RequestParam(value = "productId") String productId,
-                                                     @RequestParam(value = "page") int page,
-                                                     @RequestParam(value = "row") int row) {
-        ProductDetailDto productDetailDto = new ProductDetailDto();
-        productDetailDto.setPage(page);
-        productDetailDto.setRow(row);
-        productDetailDto.setStoreId(storeId);
-        productDetailDto.setProductId(productId);
-        return getProductDetailBMOImpl.get(productDetailDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/saveProductLabel
-     * @path /app/product/saveProductLabel
-     */
-    @RequestMapping(value = "/saveProductLabel", method = RequestMethod.POST)
-    public ResponseEntity<String> saveProductLabel(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "labelCd", "请求报文中未包含labelCd");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-
-
-        ProductLabelPo productLabelPo = BeanConvertUtil.covertBean(reqJson, ProductLabelPo.class);
-        return saveProductLabelBMOImpl.save(productLabelPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/updateProductLabel
-     * @path /app/product/updateProductLabel
-     */
-    @RequestMapping(value = "/updateProductLabel", method = RequestMethod.POST)
-    public ResponseEntity<String> updateProductLabel(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "labelCd", "请求报文中未包含labelCd");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "labelId", "labelId不能为空");
-
-
-        ProductLabelPo productLabelPo = BeanConvertUtil.covertBean(reqJson, ProductLabelPo.class);
-        return updateProductLabelBMOImpl.update(productLabelPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /product/deleteProductLabel
-     * @path /app/product/deleteProductLabel
-     */
-    @RequestMapping(value = "/deleteProductLabel", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteProductLabel(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "labelId", "labelId不能为空");
-
-
-        ProductLabelPo productLabelPo = BeanConvertUtil.covertBean(reqJson, ProductLabelPo.class);
-        return deleteProductLabelBMOImpl.delete(productLabelPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @return
-     * @serviceCode /product/queryProductLabel
-     * @path /app/product/queryProductLabel
-     */
-    @RequestMapping(value = "/queryProductLabel", method = RequestMethod.GET)
-    public ResponseEntity<String> queryProductLabel(@RequestParam(value = "labelCd", required = false) String labelCd,
-                                                    @RequestParam(value = "hasProduct", required = false) String hasProduct,
-                                                    @RequestParam(value = "page") int page,
-                                                    @RequestParam(value = "row") int row) {
-        ProductLabelDto productLabelDto = new ProductLabelDto();
-        productLabelDto.setPage(page);
-        productLabelDto.setRow(row);
-        productLabelDto.setLabelCd(labelCd);
-        productLabelDto.setHasProduct(hasProduct);
-        return getProductLabelBMOImpl.get(productLabelDto);
-    }
-
-}

+ 0 - 125
service-goods/src/main/java/com/java110/goods/api/ProductCategoryApi.java

@@ -1,125 +0,0 @@
-package com.java110.goods.api;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.product.ProductCategoryDto;
-import com.java110.goods.bmo.productCategory.IDeleteProductCategoryBMO;
-import com.java110.goods.bmo.productCategory.IGetProductCategoryBMO;
-import com.java110.goods.bmo.productCategory.ISaveProductCategoryBMO;
-import com.java110.goods.bmo.productCategory.IUpdateProductCategoryBMO;
-import com.java110.po.product.ProductCategoryPo;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@RestController
-@RequestMapping(value = "/productCategory")
-public class ProductCategoryApi {
-
-    @Autowired
-    private ISaveProductCategoryBMO saveProductCategoryBMOImpl;
-    @Autowired
-    private IUpdateProductCategoryBMO updateProductCategoryBMOImpl;
-    @Autowired
-    private IDeleteProductCategoryBMO deleteProductCategoryBMOImpl;
-
-    @Autowired
-    private IGetProductCategoryBMO getProductCategoryBMOImpl;
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /productCategory/saveProductCategory
-     * @path /app/productCategory/saveProductCategory
-     */
-    @RequestMapping(value = "/saveProductCategory", method = RequestMethod.POST)
-    public ResponseEntity<String> saveProductCategory(@RequestBody JSONObject reqJson,
-                                                      @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "categoryName", "请求报文中未包含categoryName");
-        Assert.hasKeyAndValue(reqJson, "categoryLevel", "请求报文中未包含categoryLevel");
-        Assert.hasKeyAndValue(reqJson, "seq", "请求报文中未包含seq");
-        Assert.hasKeyAndValue(reqJson, "isShow", "请求报文中未包含isShow");
-
-
-        ProductCategoryPo productCategoryPo = BeanConvertUtil.covertBean(reqJson, ProductCategoryPo.class);
-        productCategoryPo.setStoreId(storeId);
-        if (!reqJson.containsKey("parentCategoryId")) {
-            productCategoryPo.setParentCategoryId("-1");
-        }
-        return saveProductCategoryBMOImpl.save(productCategoryPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /productCategory/updateProductCategory
-     * @path /app/productCategory/updateProductCategory
-     */
-    @RequestMapping(value = "/updateProductCategory", method = RequestMethod.POST)
-    public ResponseEntity<String> updateProductCategory(@RequestBody JSONObject reqJson,
-                                                        @RequestHeader(value = "store-id") String storeId) {
-
-        Assert.hasKeyAndValue(reqJson, "categoryName", "请求报文中未包含categoryName");
-        Assert.hasKeyAndValue(reqJson, "categoryLevel", "请求报文中未包含categoryLevel");
-        Assert.hasKeyAndValue(reqJson, "seq", "请求报文中未包含seq");
-        Assert.hasKeyAndValue(reqJson, "isShow", "请求报文中未包含isShow");
-        Assert.hasKeyAndValue(reqJson, "categoryId", "categoryId不能为空");
-
-
-        ProductCategoryPo productCategoryPo = BeanConvertUtil.covertBean(reqJson, ProductCategoryPo.class);
-        productCategoryPo.setStoreId(storeId);
-        return updateProductCategoryBMOImpl.update(productCategoryPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /productCategory/deleteProductCategory
-     * @path /app/productCategory/deleteProductCategory
-     */
-    @RequestMapping(value = "/deleteProductCategory", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteProductCategory(@RequestBody JSONObject reqJson,
-                                                        @RequestHeader(value = "store-id") String storeId) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "categoryId", "categoryId不能为空");
-
-
-        ProductCategoryPo productCategoryPo = BeanConvertUtil.covertBean(reqJson, ProductCategoryPo.class);
-        productCategoryPo.setStoreId(storeId);
-        return deleteProductCategoryBMOImpl.delete(productCategoryPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 商户ID
-     * @return
-     * @serviceCode /productCategory/queryProductCategory
-     * @path /app/productCategory/queryProductCategory
-     */
-    @RequestMapping(value = "/queryProductCategory", method = RequestMethod.GET)
-    public ResponseEntity<String> queryProductCategory(@RequestHeader(value = "store-id") String storeId,
-                                                       @RequestParam(value = "page") int page,
-                                                       @RequestParam(value = "row") int row) {
-        ProductCategoryDto productCategoryDto = new ProductCategoryDto();
-        productCategoryDto.setPage(page);
-        productCategoryDto.setRow(row);
-        productCategoryDto.setStoreId(storeId);
-        return getProductCategoryBMOImpl.get(productCategoryDto);
-    }
-}

+ 0 - 463
service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java

@@ -1,463 +0,0 @@
-package com.java110.goods.api;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.storeCart.StoreCartDto;
-import com.java110.dto.storeOrder.StoreOrderDto;
-import com.java110.dto.storeOrderAddress.StoreOrderAddressDto;
-import com.java110.dto.storeOrderCart.StoreOrderCartDto;
-import com.java110.dto.storeOrderCartEvent.StoreOrderCartEventDto;
-import com.java110.goods.bmo.storeCart.IDeleteStoreCartBMO;
-import com.java110.goods.bmo.storeCart.IGetStoreCartBMO;
-import com.java110.goods.bmo.storeCart.ISaveStoreCartBMO;
-import com.java110.goods.bmo.storeCart.IUpdateStoreCartBMO;
-import com.java110.goods.bmo.storeOrder.IDeleteStoreOrderBMO;
-import com.java110.goods.bmo.storeOrder.IGetStoreOrderBMO;
-import com.java110.goods.bmo.storeOrder.ISaveStoreOrderBMO;
-import com.java110.goods.bmo.storeOrder.IUpdateStoreOrderBMO;
-import com.java110.goods.bmo.storeOrderAddress.IDeleteStoreOrderAddressBMO;
-import com.java110.goods.bmo.storeOrderAddress.IGetStoreOrderAddressBMO;
-import com.java110.goods.bmo.storeOrderAddress.ISaveStoreOrderAddressBMO;
-import com.java110.goods.bmo.storeOrderAddress.IUpdateStoreOrderAddressBMO;
-import com.java110.goods.bmo.storeOrderCart.IDeleteStoreOrderCartBMO;
-import com.java110.goods.bmo.storeOrderCart.IGetStoreOrderCartBMO;
-import com.java110.goods.bmo.storeOrderCart.ISaveStoreOrderCartBMO;
-import com.java110.goods.bmo.storeOrderCart.IUpdateStoreOrderCartBMO;
-import com.java110.goods.bmo.storeOrderCartEvent.IGetStoreOrderCartEventBMO;
-import com.java110.po.storeCart.StoreCartPo;
-import com.java110.po.storeOrder.StoreOrderPo;
-import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
-import com.java110.po.storeOrderCart.StoreOrderCartPo;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 商户订单
- * add by wuxw 2020-11-15
- */
-@RestController
-@RequestMapping(value = "/storeOrder")
-public class StoreOrderApi {
-
-
-    @Autowired
-    private ISaveStoreCartBMO saveStoreCartBMOImpl;
-    @Autowired
-    private IUpdateStoreCartBMO updateStoreCartBMOImpl;
-    @Autowired
-    private IDeleteStoreCartBMO deleteStoreCartBMOImpl;
-
-    @Autowired
-    private IGetStoreCartBMO getStoreCartBMOImpl;
-
-    @Autowired
-    private ISaveStoreOrderBMO saveStoreOrderBMOImpl;
-    @Autowired
-    private IUpdateStoreOrderBMO updateStoreOrderBMOImpl;
-    @Autowired
-    private IDeleteStoreOrderBMO deleteStoreOrderBMOImpl;
-
-    @Autowired
-    private IGetStoreOrderBMO getStoreOrderBMOImpl;
-
-
-    @Autowired
-    private ISaveStoreOrderCartBMO saveStoreOrderCartBMOImpl;
-    @Autowired
-    private IUpdateStoreOrderCartBMO updateStoreOrderCartBMOImpl;
-    @Autowired
-    private IDeleteStoreOrderCartBMO deleteStoreOrderCartBMOImpl;
-
-    @Autowired
-    private IGetStoreOrderCartBMO getStoreOrderCartBMOImpl;
-
-
-    @Autowired
-    private ISaveStoreOrderAddressBMO saveStoreOrderAddressBMOImpl;
-    @Autowired
-    private IUpdateStoreOrderAddressBMO updateStoreOrderAddressBMOImpl;
-    @Autowired
-    private IDeleteStoreOrderAddressBMO deleteStoreOrderAddressBMOImpl;
-
-    @Autowired
-    private IGetStoreOrderAddressBMO getStoreOrderAddressBMOImpl;
-
-    @Autowired
-    private IGetStoreOrderCartEventBMO getStoreOrderCartEventBMOImpl;
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/saveStoreOrder
-     * @path /app/storeOrder/saveStoreOrder
-     */
-    @RequestMapping(value = "/saveStoreOrder", method = RequestMethod.POST)
-    public ResponseEntity<String> saveStoreOrder(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "personId", "请求报文中未包含personId");
-        Assert.hasKeyAndValue(reqJson, "personName", "请求报文中未包含personName");
-        Assert.hasKeyAndValue(reqJson, "addressId", "请求报文中未包含收货人信息");
-        Assert.hasKey(reqJson, "goodsList", "未包含商品信息");
-
-        StoreOrderPo storeOrderPo = BeanConvertUtil.covertBean(reqJson, StoreOrderPo.class);
-        return saveStoreOrderBMOImpl.save(storeOrderPo, reqJson.getJSONArray("goodsList"),
-                reqJson.getString("addressId"));
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/updateStoreOrder
-     * @path /app/storeOrder/updateStoreOrder
-     */
-    @RequestMapping(value = "/updateStoreOrder", method = RequestMethod.POST)
-    public ResponseEntity<String> updateStoreOrder(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
-
-        StoreOrderPo storeOrderPo = BeanConvertUtil.covertBean(reqJson, StoreOrderPo.class);
-        return updateStoreOrderBMOImpl.update(storeOrderPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/deleteStoreOrder
-     * @path /app/storeOrder/deleteStoreOrder
-     */
-    @RequestMapping(value = "/deleteStoreOrder", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteStoreOrder(@RequestBody JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "orderId", "orderId不能为空");
-
-
-        StoreOrderPo storeOrderPo = BeanConvertUtil.covertBean(reqJson, StoreOrderPo.class);
-        return deleteStoreOrderBMOImpl.delete(storeOrderPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @return
-     * @serviceCode /storeOrder/queryStoreOrder
-     * @path /app/storeOrder/queryStoreOrder
-     */
-    @RequestMapping(value = "/queryStoreOrder", method = RequestMethod.GET)
-    public ResponseEntity<String> queryStoreOrder(
-            @RequestParam(value = "page") int page,
-            @RequestParam(value = "row") int row) {
-        StoreOrderDto storeOrderDto = new StoreOrderDto();
-        storeOrderDto.setPage(page);
-        storeOrderDto.setRow(row);
-        return getStoreOrderBMOImpl.get(storeOrderDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/saveStoreCart
-     * @path /app/storeOrder/saveStoreCart
-     */
-    @RequestMapping(value = "/saveStoreCart", method = RequestMethod.POST)
-    public ResponseEntity<String> saveStoreCart(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "valueId", "请求报文中未包含valueId");
-        Assert.hasKeyAndValue(reqJson, "personId", "请求报文中未包含personId");
-        Assert.hasKeyAndValue(reqJson, "cartNum", "请求报文中未包含cartNum");
-
-
-        StoreCartPo storeCartPo = BeanConvertUtil.covertBean(reqJson, StoreCartPo.class);
-        return saveStoreCartBMOImpl.save(storeCartPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/updateStoreCart
-     * @path /app/storeOrder/updateStoreCart
-     */
-    @RequestMapping(value = "/updateStoreCart", method = RequestMethod.POST)
-    public ResponseEntity<String> updateStoreCart(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "valueId", "请求报文中未包含valueId");
-        Assert.hasKeyAndValue(reqJson, "personId", "请求报文中未包含personId");
-        Assert.hasKeyAndValue(reqJson, "cartNum", "请求报文中未包含cartNum");
-        Assert.hasKeyAndValue(reqJson, "cartId", "cartId不能为空");
-
-
-        StoreCartPo storeCartPo = BeanConvertUtil.covertBean(reqJson, StoreCartPo.class);
-        return updateStoreCartBMOImpl.update(storeCartPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/deleteStoreCart
-     * @path /app/storeOrder/deleteStoreCart
-     */
-    @RequestMapping(value = "/deleteStoreCart", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteStoreCart(@RequestBody JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "cartId", "cartId不能为空");
-
-
-        StoreCartPo storeCartPo = BeanConvertUtil.covertBean(reqJson, StoreCartPo.class);
-        return deleteStoreCartBMOImpl.delete(storeCartPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @return
-     * @serviceCode /storeOrder/queryStoreCart
-     * @path /app/storeOrder/queryStoreCart
-     */
-    @RequestMapping(value = "/queryStoreCart", method = RequestMethod.GET)
-    public ResponseEntity<String> queryStoreCart(@RequestParam(value = "personId", required = false) String personId,
-                                                 @RequestParam(value = "page") int page,
-                                                 @RequestParam(value = "row") int row) {
-        StoreCartDto storeCartDto = new StoreCartDto();
-        storeCartDto.setPage(page);
-        storeCartDto.setRow(row);
-        storeCartDto.setPersonId(personId);
-        return getStoreCartBMOImpl.get(storeCartDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/saveStoreOrderCart
-     * @path /app/storeOrder/saveStoreOrderCart
-     */
-    @RequestMapping(value = "/saveStoreOrderCart", method = RequestMethod.POST)
-    public ResponseEntity<String> saveStoreOrderCart(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "valueId", "请求报文中未包含valueId");
-        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
-
-
-        StoreOrderCartPo storeOrderCartPo = BeanConvertUtil.covertBean(reqJson, StoreOrderCartPo.class);
-        return saveStoreOrderCartBMOImpl.save(storeOrderCartPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/updateStoreOrderCart
-     * @path /app/storeOrder/updateStoreOrderCart
-     */
-    @RequestMapping(value = "/updateStoreOrderCart", method = RequestMethod.POST)
-    public ResponseEntity<String> updateStoreOrderCart(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
-        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
-        Assert.hasKeyAndValue(reqJson, "valueId", "请求报文中未包含valueId");
-        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
-        Assert.hasKeyAndValue(reqJson, "cartId", "cartId不能为空");
-
-
-        StoreOrderCartPo storeOrderCartPo = BeanConvertUtil.covertBean(reqJson, StoreOrderCartPo.class);
-        return updateStoreOrderCartBMOImpl.update(storeOrderCartPo);
-    }
-
-    /**
-     * 发货接口
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/sendStoreOrderCart
-     * @path /app/storeOrder/sendStoreOrderCart
-     */
-    @RequestMapping(value = "/sendStoreOrderCart", method = RequestMethod.POST)
-    public ResponseEntity<String> sendStoreOrderCart(
-            @RequestHeader(value = "user-id",required = false) String userId,
-            @RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
-        Assert.hasKeyAndValue(reqJson, "cartId", "cartId不能为空");
-
-
-        StoreOrderCartPo storeOrderCartPo = BeanConvertUtil.covertBean(reqJson, StoreOrderCartPo.class);
-        return updateStoreOrderCartBMOImpl.sendOrderCart(storeOrderCartPo,userId);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/deleteStoreOrderCart
-     * @path /app/storeOrder/deleteStoreOrderCart
-     */
-    @RequestMapping(value = "/deleteStoreOrderCart", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteStoreOrderCart(@RequestBody JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "cartId", "cartId不能为空");
-
-
-        StoreOrderCartPo storeOrderCartPo = BeanConvertUtil.covertBean(reqJson, StoreOrderCartPo.class);
-        return deleteStoreOrderCartBMOImpl.delete(storeOrderCartPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @return
-     * @serviceCode /storeOrder/queryStoreOrderCart
-     * @path /app/storeOrder/queryStoreOrderCart
-     */
-    @RequestMapping(value = "/queryStoreOrderCart", method = RequestMethod.GET)
-    public ResponseEntity<String> queryStoreOrderCart(
-            @RequestHeader(value = "store-id", required = false) String storeId,
-            @RequestParam(value = "personId", required = false) String personId,
-            @RequestParam(value = "state", required = false) String state,
-            @RequestParam(value = "cartId", required = false) String cartId,
-            @RequestParam(value = "page") int page,
-            @RequestParam(value = "row") int row) {
-        StoreOrderCartDto storeOrderCartDto = new StoreOrderCartDto();
-        storeOrderCartDto.setPage(page);
-        storeOrderCartDto.setRow(row);
-        storeOrderCartDto.setStoreId(storeId);
-        storeOrderCartDto.setPersonId(personId);
-        storeOrderCartDto.setState(state);
-        storeOrderCartDto.setCartId(cartId);
-        return getStoreOrderCartBMOImpl.get(storeOrderCartDto);
-    }
-
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/saveStoreOrderAddress
-     * @path /app/storeOrder/saveStoreOrderAddress
-     */
-    @RequestMapping(value = "/saveStoreOrderAddress", method = RequestMethod.POST)
-    public ResponseEntity<String> saveStoreOrderAddress(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
-        Assert.hasKeyAndValue(reqJson, "areaCode", "请求报文中未包含areaCode");
-        Assert.hasKeyAndValue(reqJson, "tel", "请求报文中未包含tel");
-        Assert.hasKeyAndValue(reqJson, "address", "请求报文中未包含address");
-        Assert.hasKeyAndValue(reqJson, "username", "请求报文中未包含username");
-
-
-        StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
-        return saveStoreOrderAddressBMOImpl.save(storeOrderAddressPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/updateStoreOrderAddress
-     * @path /app/storeOrder/updateStoreOrderAddress
-     */
-    @RequestMapping(value = "/updateStoreOrderAddress", method = RequestMethod.POST)
-    public ResponseEntity<String> updateStoreOrderAddress(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
-        Assert.hasKeyAndValue(reqJson, "areaCode", "请求报文中未包含areaCode");
-        Assert.hasKeyAndValue(reqJson, "tel", "请求报文中未包含tel");
-        Assert.hasKeyAndValue(reqJson, "address", "请求报文中未包含address");
-        Assert.hasKeyAndValue(reqJson, "username", "请求报文中未包含username");
-        Assert.hasKeyAndValue(reqJson, "oaId", "oaId不能为空");
-
-
-        StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
-        return updateStoreOrderAddressBMOImpl.update(storeOrderAddressPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrder/deleteStoreOrderAddress
-     * @path /app/storeOrder/deleteStoreOrderAddress
-     */
-    @RequestMapping(value = "/deleteStoreOrderAddress", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteStoreOrderAddress(@RequestBody JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "oaId", "oaId不能为空");
-
-
-        StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
-        return deleteStoreOrderAddressBMOImpl.delete(storeOrderAddressPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param orderId 订单ID
-     * @return
-     * @serviceCode /storeOrder/queryStoreOrderAddress
-     * @path /app/storeOrder/queryStoreOrderAddress
-     */
-    @RequestMapping(value = "/queryStoreOrderAddress", method = RequestMethod.GET)
-    public ResponseEntity<String> queryStoreOrderAddress(@RequestParam(value = "orderId") String orderId,
-                                                         @RequestParam(value = "page") int page,
-                                                         @RequestParam(value = "row") int row) {
-        StoreOrderAddressDto storeOrderAddressDto = new StoreOrderAddressDto();
-        storeOrderAddressDto.setPage(page);
-        storeOrderAddressDto.setRow(row);
-        storeOrderAddressDto.setOrderId(orderId);
-        return getStoreOrderAddressBMOImpl.get(storeOrderAddressDto);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param cartId 购物车ID
-     * @return
-     * @serviceCode /storeOrder/queryStoreOrderCartEvent
-     * @path /app/storeOrder/queryStoreOrderCartEvent
-     */
-    @RequestMapping(value = "/queryStoreOrderCartEvent", method = RequestMethod.GET)
-    public ResponseEntity<String> queryStoreOrderCartEvent(@RequestParam(value = "cartId") String cartId,
-                                                           @RequestParam(value = "orderId") String orderId,
-                                                           @RequestParam(value = "page") int page,
-                                                           @RequestParam(value = "row") int row) {
-        StoreOrderCartEventDto storeOrderCartEventDto = new StoreOrderCartEventDto();
-        storeOrderCartEventDto.setPage(page);
-        storeOrderCartEventDto.setRow(row);
-        storeOrderCartEventDto.setCartId(cartId);
-        storeOrderCartEventDto.setOrderId(orderId);
-        return getStoreOrderCartEventBMOImpl.get(storeOrderCartEventDto);
-    }
-}

+ 0 - 137
service-goods/src/main/java/com/java110/goods/api/StoreOrderCartReturnApi.java

@@ -1,137 +0,0 @@
-package com.java110.goods.api;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.storeOrderCartReturn.StoreOrderCartReturnDto;
-import com.java110.dto.storeOrderCartReturnEvent.StoreOrderCartReturnEventDto;
-import com.java110.goods.bmo.storeOrderCartReturn.IDeleteStoreOrderCartReturnBMO;
-import com.java110.goods.bmo.storeOrderCartReturn.IGetStoreOrderCartReturnBMO;
-import com.java110.goods.bmo.storeOrderCartReturn.ISaveStoreOrderCartReturnBMO;
-import com.java110.goods.bmo.storeOrderCartReturn.IUpdateStoreOrderCartReturnBMO;
-import com.java110.goods.bmo.storeOrderCartReturnEvent.IGetStoreOrderCartReturnEventBMO;
-import com.java110.po.storeOrderCartReturn.StoreOrderCartReturnPo;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-
-@RestController
-@RequestMapping(value = "/storeOrderCartReturn")
-public class StoreOrderCartReturnApi {
-
-    @Autowired
-    private ISaveStoreOrderCartReturnBMO saveStoreOrderCartReturnBMOImpl;
-    @Autowired
-    private IUpdateStoreOrderCartReturnBMO updateStoreOrderCartReturnBMOImpl;
-    @Autowired
-    private IDeleteStoreOrderCartReturnBMO deleteStoreOrderCartReturnBMOImpl;
-
-    @Autowired
-    private IGetStoreOrderCartReturnBMO getStoreOrderCartReturnBMOImpl;
-
-    @Autowired
-    private IGetStoreOrderCartReturnEventBMO getStoreOrderCartReturnEventBMOImpl;
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrderCartReturn/saveStoreOrderCartReturn
-     * @path /app/storeOrderCartReturn/saveStoreOrderCartReturn
-     */
-    @RequestMapping(value = "/saveStoreOrderCartReturn", method = RequestMethod.POST)
-    public ResponseEntity<String> saveStoreOrderCartReturn(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
-        Assert.hasKeyAndValue(reqJson, "cartId", "请求报文中未包含cartId");
-        Assert.hasKeyAndValue(reqJson, "personIds", "请求报文中未包含personIds");
-        Assert.hasKeyAndValue(reqJson, "returnReason", "请求报文中未包含returnReason");
-
-        StoreOrderCartReturnPo storeOrderCartReturnPo = BeanConvertUtil.covertBean(reqJson, StoreOrderCartReturnPo.class);
-        return saveStoreOrderCartReturnBMOImpl.save(storeOrderCartReturnPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrderCartReturn/updateStoreOrderCartReturn
-     * @path /app/storeOrderCartReturn/updateStoreOrderCartReturn
-     */
-    @RequestMapping(value = "/updateStoreOrderCartReturn", method = RequestMethod.POST)
-    public ResponseEntity<String> updateStoreOrderCartReturn(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
-        Assert.hasKeyAndValue(reqJson, "cartId", "请求报文中未包含cartId");
-        Assert.hasKeyAndValue(reqJson, "personIds", "请求报文中未包含personIds");
-        Assert.hasKeyAndValue(reqJson, "returnReason", "请求报文中未包含returnReason");
-        Assert.hasKeyAndValue(reqJson, "returnId", "returnId不能为空");
-
-
-        StoreOrderCartReturnPo storeOrderCartReturnPo = BeanConvertUtil.covertBean(reqJson, StoreOrderCartReturnPo.class);
-        return updateStoreOrderCartReturnBMOImpl.update(storeOrderCartReturnPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /storeOrderCartReturn/deleteStoreOrderCartReturn
-     * @path /app/storeOrderCartReturn/deleteStoreOrderCartReturn
-     */
-    @RequestMapping(value = "/deleteStoreOrderCartReturn", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteStoreOrderCartReturn(@RequestBody JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "returnId", "returnId不能为空");
-
-
-        StoreOrderCartReturnPo storeOrderCartReturnPo = BeanConvertUtil.covertBean(reqJson, StoreOrderCartReturnPo.class);
-        return deleteStoreOrderCartReturnBMOImpl.delete(storeOrderCartReturnPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param orderId 订单ID
-     * @return
-     * @serviceCode /storeOrderCartReturn/queryStoreOrderCartReturn
-     * @path /app/storeOrderCartReturn/queryStoreOrderCartReturn
-     */
-    @RequestMapping(value = "/queryStoreOrderCartReturn", method = RequestMethod.GET)
-    public ResponseEntity<String> queryStoreOrderCartReturn(@RequestParam(value = "cartId") String cartId,
-                                                            @RequestParam(value = "orderId") String orderId,
-                                                            @RequestParam(value = "page") int page,
-                                                            @RequestParam(value = "row") int row) {
-        StoreOrderCartReturnDto storeOrderCartReturnDto = new StoreOrderCartReturnDto();
-        storeOrderCartReturnDto.setPage(page);
-        storeOrderCartReturnDto.setRow(row);
-        storeOrderCartReturnDto.setOrderId(orderId);
-        storeOrderCartReturnDto.setOrderId(cartId);
-        return getStoreOrderCartReturnBMOImpl.get(storeOrderCartReturnDto);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 商户ID
-     * @return
-     * @serviceCode /storeOrderCartReturnEvent/queryStoreOrderCartReturnEvent
-     * @path /app/storeOrderCartReturnEvent/queryStoreOrderCartReturnEvent
-     */
-    @RequestMapping(value = "/queryStoreOrderCartReturnEvent", method = RequestMethod.GET)
-    public ResponseEntity<String> queryStoreOrderCartReturnEvent(@RequestParam(value = "returnId") String returnId,
-                                                                 @RequestParam(value = "storeId") String storeId,
-                                                                 @RequestParam(value = "page") int page,
-                                                                 @RequestParam(value = "row") int row) {
-        StoreOrderCartReturnEventDto storeOrderCartReturnEventDto = new StoreOrderCartReturnEventDto();
-        storeOrderCartReturnEventDto.setPage(page);
-        storeOrderCartReturnEventDto.setRow(row);
-        storeOrderCartReturnEventDto.setReturnId(returnId);
-        return getStoreOrderCartReturnEventBMOImpl.get(storeOrderCartReturnEventDto);
-    }
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuy/IDeleteGroupBuyBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuy;
-
-import com.java110.po.groupBuy.GroupBuyPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteGroupBuyBMO {
-
-
-    /**
-     * 修改拼团购买
-     * add by wuxw
-     *
-     * @param groupBuyPo
-     * @return
-     */
-    ResponseEntity<String> delete(GroupBuyPo groupBuyPo);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuy/IGetGroupBuyBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuy;
-
-import com.java110.dto.groupBuy.GroupBuyDto;
-import org.springframework.http.ResponseEntity;
-
-public interface IGetGroupBuyBMO {
-
-
-    /**
-     * 查询拼团购买
-     * add by wuxw
-     *
-     * @param groupBuyDto
-     * @return
-     */
-    ResponseEntity<String> get(GroupBuyDto groupBuyDto);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuy/ISaveGroupBuyBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuy;
-
-import com.java110.po.groupBuy.GroupBuyPo;
-import org.springframework.http.ResponseEntity;
-
-public interface ISaveGroupBuyBMO {
-
-
-    /**
-     * 添加拼团购买
-     * add by wuxw
-     *
-     * @param groupBuyPo
-     * @return
-     */
-    ResponseEntity<String> save(GroupBuyPo groupBuyPo);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuy/IUpdateGroupBuyBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuy;
-
-import com.java110.po.groupBuy.GroupBuyPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IUpdateGroupBuyBMO {
-
-
-    /**
-     * 修改拼团购买
-     * add by wuxw
-     *
-     * @param groupBuyPo
-     * @return
-     */
-    ResponseEntity<String> update(GroupBuyPo groupBuyPo);
-
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/groupBuy/impl/DeleteGroupBuyBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.groupBuy.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.groupBuy.IDeleteGroupBuyBMO;
-import com.java110.intf.goods.IGroupBuyInnerServiceSMO;
-import com.java110.po.groupBuy.GroupBuyPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteGroupBuyBMOImpl")
-public class DeleteGroupBuyBMOImpl implements IDeleteGroupBuyBMO {
-
-    @Autowired
-    private IGroupBuyInnerServiceSMO groupBuyInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(GroupBuyPo groupBuyPo) {
-
-        int flag = groupBuyInnerServiceSMOImpl.deleteGroupBuy(groupBuyPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 44
service-goods/src/main/java/com/java110/goods/bmo/groupBuy/impl/GetGroupBuyBMOImpl.java

@@ -1,44 +0,0 @@
-package com.java110.goods.bmo.groupBuy.impl;
-
-import com.java110.dto.groupBuy.GroupBuyDto;
-import com.java110.goods.bmo.groupBuy.IGetGroupBuyBMO;
-import com.java110.intf.goods.IGroupBuyInnerServiceSMO;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getGroupBuyBMOImpl")
-public class GetGroupBuyBMOImpl implements IGetGroupBuyBMO {
-
-    @Autowired
-    private IGroupBuyInnerServiceSMO groupBuyInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(GroupBuyDto groupBuyDto) {
-
-
-        int count = groupBuyInnerServiceSMOImpl.queryGroupBuysCount(groupBuyDto);
-
-        List<GroupBuyDto> groupBuyDtos = null;
-        if (count > 0) {
-            groupBuyDtos = groupBuyInnerServiceSMOImpl.queryGroupBuys(groupBuyDto);
-        } else {
-            groupBuyDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) groupBuyDto.getRow()), count, groupBuyDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-}

+ 0 - 38
service-goods/src/main/java/com/java110/goods/bmo/groupBuy/impl/SaveGroupBuyBMOImpl.java

@@ -1,38 +0,0 @@
-package com.java110.goods.bmo.groupBuy.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.goods.bmo.groupBuy.ISaveGroupBuyBMO;
-import com.java110.intf.goods.IGroupBuyInnerServiceSMO;
-import com.java110.po.groupBuy.GroupBuyPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("saveGroupBuyBMOImpl")
-public class SaveGroupBuyBMOImpl implements ISaveGroupBuyBMO {
-
-    @Autowired
-    private IGroupBuyInnerServiceSMO groupBuyInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param groupBuyPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(GroupBuyPo groupBuyPo) {
-
-        groupBuyPo.setBuyId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_buyId));
-        int flag = groupBuyInnerServiceSMOImpl.saveGroupBuy(groupBuyPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/groupBuy/impl/UpdateGroupBuyBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.groupBuy.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.groupBuy.IUpdateGroupBuyBMO;
-import com.java110.intf.goods.IGroupBuyInnerServiceSMO;
-import com.java110.po.groupBuy.GroupBuyPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("updateGroupBuyBMOImpl")
-public class UpdateGroupBuyBMOImpl implements IUpdateGroupBuyBMO {
-
-    @Autowired
-    private IGroupBuyInnerServiceSMO groupBuyInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(GroupBuyPo groupBuyPo) {
-
-        int flag = groupBuyInnerServiceSMOImpl.updateGroupBuy(groupBuyPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/IDeleteGroupBuyBatchBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuyBatch;
-
-import com.java110.po.groupBuyBatch.GroupBuyBatchPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteGroupBuyBatchBMO {
-
-
-    /**
-     * 修改拼团批次
-     * add by wuxw
-     *
-     * @param groupBuyBatchPo
-     * @return
-     */
-    ResponseEntity<String> delete(GroupBuyBatchPo groupBuyBatchPo);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/IGetGroupBuyBatchBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuyBatch;
-
-import com.java110.dto.groupBuyBatch.GroupBuyBatchDto;
-import org.springframework.http.ResponseEntity;
-
-public interface IGetGroupBuyBatchBMO {
-
-
-    /**
-     * 查询拼团批次
-     * add by wuxw
-     *
-     * @param groupBuyBatchDto
-     * @return
-     */
-    ResponseEntity<String> get(GroupBuyBatchDto groupBuyBatchDto);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/ISaveGroupBuyBatchBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuyBatch;
-
-import com.java110.po.groupBuyBatch.GroupBuyBatchPo;
-import org.springframework.http.ResponseEntity;
-
-public interface ISaveGroupBuyBatchBMO {
-
-
-    /**
-     * 添加拼团批次
-     * add by wuxw
-     *
-     * @param groupBuyBatchPo
-     * @return
-     */
-    ResponseEntity<String> save(GroupBuyBatchPo groupBuyBatchPo);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/IUpdateGroupBuyBatchBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuyBatch;
-
-import com.java110.po.groupBuyBatch.GroupBuyBatchPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IUpdateGroupBuyBatchBMO {
-
-
-    /**
-     * 修改拼团批次
-     * add by wuxw
-     *
-     * @param groupBuyBatchPo
-     * @return
-     */
-    ResponseEntity<String> update(GroupBuyBatchPo groupBuyBatchPo);
-
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/impl/DeleteGroupBuyBatchBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.groupBuyBatch.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.groupBuyBatch.IDeleteGroupBuyBatchBMO;
-import com.java110.intf.goods.IGroupBuyBatchInnerServiceSMO;
-import com.java110.po.groupBuyBatch.GroupBuyBatchPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteGroupBuyBatchBMOImpl")
-public class DeleteGroupBuyBatchBMOImpl implements IDeleteGroupBuyBatchBMO {
-
-    @Autowired
-    private IGroupBuyBatchInnerServiceSMO groupBuyBatchInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyBatchPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(GroupBuyBatchPo groupBuyBatchPo) {
-
-        int flag = groupBuyBatchInnerServiceSMOImpl.deleteGroupBuyBatch(groupBuyBatchPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 44
service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/impl/GetGroupBuyBatchBMOImpl.java

@@ -1,44 +0,0 @@
-package com.java110.goods.bmo.groupBuyBatch.impl;
-
-import com.java110.dto.groupBuyBatch.GroupBuyBatchDto;
-import com.java110.goods.bmo.groupBuyBatch.IGetGroupBuyBatchBMO;
-import com.java110.intf.goods.IGroupBuyBatchInnerServiceSMO;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getGroupBuyBatchBMOImpl")
-public class GetGroupBuyBatchBMOImpl implements IGetGroupBuyBatchBMO {
-
-    @Autowired
-    private IGroupBuyBatchInnerServiceSMO groupBuyBatchInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyBatchDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(GroupBuyBatchDto groupBuyBatchDto) {
-
-
-        int count = groupBuyBatchInnerServiceSMOImpl.queryGroupBuyBatchsCount(groupBuyBatchDto);
-
-        List<GroupBuyBatchDto> groupBuyBatchDtos = null;
-        if (count > 0) {
-            groupBuyBatchDtos = groupBuyBatchInnerServiceSMOImpl.queryGroupBuyBatchs(groupBuyBatchDto);
-        } else {
-            groupBuyBatchDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) groupBuyBatchDto.getRow()), count, groupBuyBatchDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-}

+ 0 - 38
service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/impl/SaveGroupBuyBatchBMOImpl.java

@@ -1,38 +0,0 @@
-package com.java110.goods.bmo.groupBuyBatch.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.goods.bmo.groupBuyBatch.ISaveGroupBuyBatchBMO;
-import com.java110.intf.goods.IGroupBuyBatchInnerServiceSMO;
-import com.java110.po.groupBuyBatch.GroupBuyBatchPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("saveGroupBuyBatchBMOImpl")
-public class SaveGroupBuyBatchBMOImpl implements ISaveGroupBuyBatchBMO {
-
-    @Autowired
-    private IGroupBuyBatchInnerServiceSMO groupBuyBatchInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param groupBuyBatchPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(GroupBuyBatchPo groupBuyBatchPo) {
-
-        groupBuyBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_batchId));
-        int flag = groupBuyBatchInnerServiceSMOImpl.saveGroupBuyBatch(groupBuyBatchPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/groupBuyBatch/impl/UpdateGroupBuyBatchBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.groupBuyBatch.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.groupBuyBatch.IUpdateGroupBuyBatchBMO;
-import com.java110.intf.goods.IGroupBuyBatchInnerServiceSMO;
-import com.java110.po.groupBuyBatch.GroupBuyBatchPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("updateGroupBuyBatchBMOImpl")
-public class UpdateGroupBuyBatchBMOImpl implements IUpdateGroupBuyBatchBMO {
-
-    @Autowired
-    private IGroupBuyBatchInnerServiceSMO groupBuyBatchInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyBatchPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(GroupBuyBatchPo groupBuyBatchPo) {
-
-        int flag = groupBuyBatchInnerServiceSMOImpl.updateGroupBuyBatch(groupBuyBatchPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/IDeleteGroupBuyProductBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuyProduct;
-
-import com.java110.po.groupBuyProduct.GroupBuyProductPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteGroupBuyProductBMO {
-
-
-    /**
-     * 修改拼团产品
-     * add by wuxw
-     *
-     * @param groupBuyProductPo
-     * @return
-     */
-    ResponseEntity<String> delete(GroupBuyProductPo groupBuyProductPo);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/IGetGroupBuyProductBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuyProduct;
-
-import com.java110.dto.groupBuyProduct.GroupBuyProductDto;
-import org.springframework.http.ResponseEntity;
-
-public interface IGetGroupBuyProductBMO {
-
-
-    /**
-     * 查询拼团产品
-     * add by wuxw
-     *
-     * @param groupBuyProductDto
-     * @return
-     */
-    ResponseEntity<String> get(GroupBuyProductDto groupBuyProductDto);
-
-
-}

+ 0 - 22
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/ISaveGroupBuyProductBMO.java

@@ -1,22 +0,0 @@
-package com.java110.goods.bmo.groupBuyProduct;
-
-import com.java110.po.groupBuyProduct.GroupBuyProductPo;
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
-
-public interface ISaveGroupBuyProductBMO {
-
-
-    /**
-     * 添加拼团产品
-     * add by wuxw
-     *
-     * @param groupBuyProductPo
-     * @return
-     */
-    ResponseEntity<String> save(GroupBuyProductPo groupBuyProductPo, List<GroupBuyProductSpecPo> groupBuyProductSpecPos);
-
-
-}

+ 0 - 22
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/IUpdateGroupBuyProductBMO.java

@@ -1,22 +0,0 @@
-package com.java110.goods.bmo.groupBuyProduct;
-
-import com.java110.po.groupBuyProduct.GroupBuyProductPo;
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
-
-public interface IUpdateGroupBuyProductBMO {
-
-
-    /**
-     * 修改拼团产品
-     * add by wuxw
-     *
-     * @param groupBuyProductPo
-     * @return
-     */
-    ResponseEntity<String> update(GroupBuyProductPo groupBuyProductPo, List<GroupBuyProductSpecPo> groupBuyProductSpecPos);
-
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/impl/DeleteGroupBuyProductBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.groupBuyProduct.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.groupBuyProduct.IDeleteGroupBuyProductBMO;
-import com.java110.intf.goods.IGroupBuyProductInnerServiceSMO;
-import com.java110.po.groupBuyProduct.GroupBuyProductPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteGroupBuyProductBMOImpl")
-public class DeleteGroupBuyProductBMOImpl implements IDeleteGroupBuyProductBMO {
-
-    @Autowired
-    private IGroupBuyProductInnerServiceSMO groupBuyProductInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyProductPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(GroupBuyProductPo groupBuyProductPo) {
-
-        int flag = groupBuyProductInnerServiceSMOImpl.deleteGroupBuyProduct(groupBuyProductPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 184
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/impl/GetGroupBuyProductBMOImpl.java

@@ -1,184 +0,0 @@
-package com.java110.goods.bmo.groupBuyProduct.impl;
-
-import com.java110.dto.file.FileRelDto;
-import com.java110.dto.groupBuyProduct.GroupBuyProductDto;
-import com.java110.dto.groupBuyProductSpec.GroupBuyProductSpecDto;
-import com.java110.dto.product.ProductSpecDetailDto;
-import com.java110.dto.productDetail.ProductDetailDto;
-import com.java110.dto.productSpecValue.ProductSpecValueDto;
-import com.java110.goods.bmo.groupBuyProduct.IGetGroupBuyProductBMO;
-import com.java110.intf.goods.IGroupBuyProductInnerServiceSMO;
-import com.java110.intf.goods.IGroupBuyProductSpecInnerServiceSMO;
-import com.java110.intf.goods.IProductDetailInnerServiceSMO;
-import com.java110.intf.goods.IProductSpecValueInnerServiceSMO;
-import com.java110.intf.common.IFileRelInnerServiceSMO;
-import com.java110.intf.goods.IProductInnerServiceSMO;
-import com.java110.intf.goods.IProductSpecDetailInnerServiceSMO;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getGroupBuyProductBMOImpl")
-public class GetGroupBuyProductBMOImpl implements IGetGroupBuyProductBMO {
-
-    @Autowired
-    private IGroupBuyProductInnerServiceSMO groupBuyProductInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductInnerServiceSMO productInnerServiceSMOImpl;
-
-    @Autowired
-    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductDetailInnerServiceSMO productDetailInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecValueInnerServiceSMO productSpecValueInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecDetailInnerServiceSMO productSpecDetailInnerServiceSMOImpl;
-
-    @Autowired
-    private IGroupBuyProductSpecInnerServiceSMO groupBuyProductSpecInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyProductDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(GroupBuyProductDto groupBuyProductDto) {
-
-
-        int count = groupBuyProductInnerServiceSMOImpl.queryGroupBuyProductsCount(groupBuyProductDto);
-
-        List<GroupBuyProductDto> groupBuyProductDtos = null;
-        if (count > 0) {
-            groupBuyProductDtos = groupBuyProductInnerServiceSMOImpl.queryGroupBuyProducts(groupBuyProductDto);
-            freshProductDtos(groupBuyProductDtos, groupBuyProductDto);
-        } else {
-            groupBuyProductDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) groupBuyProductDto.getRow()), count, groupBuyProductDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-
-    private void freshProductDtos(List<GroupBuyProductDto> productDtos, GroupBuyProductDto productDto) {
-
-        if (productDtos == null || productDtos.size() < 1) {
-            return;
-        }
-
-        //输入
-        List<String> productIds = new ArrayList<>();
-
-        for (GroupBuyProductDto tmpProductDto : productDtos) {
-            productIds.add(tmpProductDto.getProductId());
-        }
-
-        FileRelDto fileRelDto = new FileRelDto();
-        fileRelDto.setObjIds(productIds.toArray(new String[productIds.size()]));
-        fileRelDto.setRelTypeCd(FileRelDto.REL_TYPE_CD_GOODS_COVER);
-        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-
-        //刷入图片信息
-        List<String> photoVos = null;
-        String url = null;
-        for (GroupBuyProductDto tmpProductDto : productDtos) {
-            for (FileRelDto tmpFileRelDto : fileRelDtos) {
-                if (tmpProductDto.getProductId().equals(tmpFileRelDto.getObjId())) {
-                    url = "/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=-1";
-                    tmpProductDto.setCoverPhoto(url);
-                }
-            }
-        }
-
-        //刷入库存和销量
-        GroupBuyProductSpecDto productSpecValueDto = new GroupBuyProductSpecDto();
-        productSpecValueDto.setStoreId(productDtos.get(0).getStoreId());
-        productSpecValueDto.setProductIds(productIds.toArray(new String[productIds.size()]));
-        List<GroupBuyProductSpecDto> productSpecValueDtos = groupBuyProductSpecInnerServiceSMOImpl.queryProductStockAndSales(productSpecValueDto);
-        for (GroupBuyProductDto tmpProduct : productDtos) {
-            for (GroupBuyProductSpecDto tmpProdSpecValue : productSpecValueDtos) {
-                if (tmpProdSpecValue.getProductId().equals(tmpProduct.getProductId())) {
-                    tmpProduct.setStock(tmpProdSpecValue.getGroupStock());
-                }
-            }
-        }
-
-        // 查询规格
-        if (productDtos.size() > 1) {
-            return;
-        }
-
-        //输入轮播图
-        fileRelDto = new FileRelDto();
-        fileRelDto.setObjId(productDtos.get(0).getProductId());
-        fileRelDto.setRelTypeCd(FileRelDto.REL_TYPE_CD_GOODS_CAROUSEL_FIGURE);
-        fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-        List<String> photos = new ArrayList<>();
-        for (GroupBuyProductDto tmpProductDto : productDtos) {
-            for (FileRelDto tmpFileRelDto : fileRelDtos) {
-                if (tmpProductDto.getProductId().equals(tmpFileRelDto.getObjId())) {
-                    url = "/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=-1";
-                    photos.add(url);
-                }
-            }
-            tmpProductDto.setCarouselFigurePhotos(photos);
-        }
-
-        freshProductSpecValue(productDtos);
-
-        ProductDetailDto productDetailDto = new ProductDetailDto();
-        productDetailDto.setProductId(productDtos.get(0).getProductId());
-        productDetailDto.setStoreId(productDtos.get(0).getStoreId());
-        List<ProductDetailDto> productDetailDtos = productDetailInnerServiceSMOImpl.queryProductDetails(productDetailDto);
-
-        if (productDetailDtos == null || productDetailDtos.size() < 1) {
-            return;
-        }
-
-        productDtos.get(0).setContent(productDetailDtos.get(0).getContent());
-    }
-
-    private void freshProductSpecValue(List<GroupBuyProductDto> productDtos) {
-        GroupBuyProductSpecDto productSpecValueDto = new GroupBuyProductSpecDto();
-        productSpecValueDto.setProductId(productDtos.get(0).getProductId());
-        productSpecValueDto.setStoreId(productDtos.get(0).getStoreId());
-        List<GroupBuyProductSpecDto> productSpecValueDtos = groupBuyProductSpecInnerServiceSMOImpl.queryGroupBuyProductSpecs(productSpecValueDto);
-
-        if (productSpecValueDtos == null || productSpecValueDtos.size() < 1) {
-            return;
-        }
-        productDtos.get(0).setGroupBuyProductSpecs(productSpecValueDtos);
-
-        List<String> specIds = new ArrayList<>();
-        for (ProductSpecValueDto productSpecValue : productSpecValueDtos) {
-            specIds.add(productSpecValue.getSpecId());
-        }
-
-        ProductSpecDetailDto productSpecDetailDto = new ProductSpecDetailDto();
-        productSpecDetailDto.setSpecIds(specIds.toArray(new String[specIds.size()]));
-        productSpecDetailDto.setStoreId(productDtos.get(0).getStoreId());
-        List<ProductSpecDetailDto> productSpecDetailDtos = productSpecDetailInnerServiceSMOImpl.queryProductSpecDetails(productSpecDetailDto);
-        List<ProductSpecDetailDto> tmpProductSpecDetailDtos = null;
-        for (ProductSpecValueDto productSpecValue : productSpecValueDtos) {
-            tmpProductSpecDetailDtos = new ArrayList<>();
-            for (ProductSpecDetailDto tmpProductSpecDetailDto : productSpecDetailDtos) {
-                if (productSpecValue.getSpecId().equals(tmpProductSpecDetailDto.getSpecId())) {
-                    tmpProductSpecDetailDtos.add(tmpProductSpecDetailDto);
-                }
-            }
-            productSpecValue.setProductSpecDetails(tmpProductSpecDetailDtos);
-        }
-    }
-}

+ 0 - 68
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/impl/SaveGroupBuyProductBMOImpl.java

@@ -1,68 +0,0 @@
-package com.java110.goods.bmo.groupBuyProduct.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.groupBuyBatch.GroupBuyBatchDto;
-import com.java110.goods.bmo.groupBuyProduct.ISaveGroupBuyProductBMO;
-import com.java110.intf.goods.IGroupBuyBatchInnerServiceSMO;
-import com.java110.intf.goods.IGroupBuyProductInnerServiceSMO;
-import com.java110.intf.goods.IGroupBuyProductSpecInnerServiceSMO;
-import com.java110.po.groupBuyProduct.GroupBuyProductPo;
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("saveGroupBuyProductBMOImpl")
-public class SaveGroupBuyProductBMOImpl implements ISaveGroupBuyProductBMO {
-
-    @Autowired
-    private IGroupBuyProductInnerServiceSMO groupBuyProductInnerServiceSMOImpl;
-
-    @Autowired
-    private IGroupBuyProductSpecInnerServiceSMO groupBuyProductSpecInnerServiceSMOImpl;
-
-    @Autowired
-    private IGroupBuyBatchInnerServiceSMO groupBuyBatchInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param groupBuyProductPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(GroupBuyProductPo groupBuyProductPo,
-                                       List<GroupBuyProductSpecPo> groupBuyProductSpecPos) {
-        GroupBuyBatchDto groupBuyBatchDto = new GroupBuyBatchDto();
-        groupBuyBatchDto.setCurBatch("Y");
-        groupBuyBatchDto.setStoreId(groupBuyProductPo.getStoreId());
-        List<GroupBuyBatchDto> groupBuyBatchDtos = groupBuyBatchInnerServiceSMOImpl.queryGroupBuyBatchs(groupBuyBatchDto);
-
-        if (groupBuyBatchDtos.size() < 1) {
-            throw new IllegalArgumentException("未找到批次信息");
-        }
-
-        groupBuyProductPo.setBatchId(groupBuyBatchDtos.get(0).getBatchId());
-
-        groupBuyProductPo.setGroupId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_groupId));
-        int flag = groupBuyProductInnerServiceSMOImpl.saveGroupBuyProduct(groupBuyProductPo);
-
-        if (flag < 1) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-        }
-
-        for (GroupBuyProductSpecPo groupBuyProductSpecPo : groupBuyProductSpecPos) {
-            flag = groupBuyProductSpecInnerServiceSMOImpl.saveGroupBuyProductSpec(groupBuyProductSpecPo);
-            if (flag < 1) {
-                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-            }
-        }
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-
-    }
-
-}

+ 0 - 48
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/impl/UpdateGroupBuyProductBMOImpl.java

@@ -1,48 +0,0 @@
-package com.java110.goods.bmo.groupBuyProduct.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.groupBuyProduct.IUpdateGroupBuyProductBMO;
-import com.java110.intf.goods.IGroupBuyProductInnerServiceSMO;
-import com.java110.intf.goods.IGroupBuyProductSpecInnerServiceSMO;
-import com.java110.po.groupBuyProduct.GroupBuyProductPo;
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("updateGroupBuyProductBMOImpl")
-public class UpdateGroupBuyProductBMOImpl implements IUpdateGroupBuyProductBMO {
-
-    @Autowired
-    private IGroupBuyProductInnerServiceSMO groupBuyProductInnerServiceSMOImpl;
-
-    @Autowired
-    private IGroupBuyProductSpecInnerServiceSMO groupBuyProductSpecInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyProductPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(GroupBuyProductPo groupBuyProductPo, List<GroupBuyProductSpecPo> groupBuyProductSpecPos) {
-
-        int flag = groupBuyProductInnerServiceSMOImpl.updateGroupBuyProduct(groupBuyProductPo);
-
-        if (flag < 1) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-        }
-
-        for (GroupBuyProductSpecPo groupBuyProductSpecPo : groupBuyProductSpecPos) {
-            flag = groupBuyProductSpecInnerServiceSMOImpl.updateGroupBuyProductSpec(groupBuyProductSpecPo);
-            if (flag < 1) {
-                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-            }
-        }
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-
-    }
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/IDeleteGroupBuyProductSpecBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuyProductSpec;
-
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteGroupBuyProductSpecBMO {
-
-
-    /**
-     * 修改拼团产品规格
-     * add by wuxw
-     *
-     * @param groupBuyProductSpecPo
-     * @return
-     */
-    ResponseEntity<String> delete(GroupBuyProductSpecPo groupBuyProductSpecPo);
-
-
-}

+ 0 - 16
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/IGetGroupBuyProductSpecBMO.java

@@ -1,16 +0,0 @@
-package com.java110.goods.bmo.groupBuyProductSpec;
-import com.java110.dto.groupBuyProductSpec.GroupBuyProductSpecDto;
-import org.springframework.http.ResponseEntity;
-public interface IGetGroupBuyProductSpecBMO {
-
-
-    /**
-     * 查询拼团产品规格
-     * add by wuxw
-     * @param  groupBuyProductSpecDto
-     * @return
-     */
-    ResponseEntity<String> get(GroupBuyProductSpecDto groupBuyProductSpecDto);
-
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/ISaveGroupBuyProductSpecBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.groupBuyProductSpec;
-
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import org.springframework.http.ResponseEntity;
-public interface ISaveGroupBuyProductSpecBMO {
-
-
-    /**
-     * 添加拼团产品规格
-     * add by wuxw
-     * @param groupBuyProductSpecPo
-     * @return
-     */
-    ResponseEntity<String> save(GroupBuyProductSpecPo groupBuyProductSpecPo);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/IUpdateGroupBuyProductSpecBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuyProductSpec;
-
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IUpdateGroupBuyProductSpecBMO {
-
-
-    /**
-     * 修改拼团产品规格
-     * add by wuxw
-     *
-     * @param groupBuyProductSpecPo
-     * @return
-     */
-    ResponseEntity<String> update(GroupBuyProductSpecPo groupBuyProductSpecPo);
-
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/impl/DeleteGroupBuyProductSpecBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.groupBuyProductSpec.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.groupBuyProductSpec.IDeleteGroupBuyProductSpecBMO;
-import com.java110.intf.goods.IGroupBuyProductSpecInnerServiceSMO;
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteGroupBuyProductSpecBMOImpl")
-public class DeleteGroupBuyProductSpecBMOImpl implements IDeleteGroupBuyProductSpecBMO {
-
-    @Autowired
-    private IGroupBuyProductSpecInnerServiceSMO groupBuyProductSpecInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyProductSpecPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(GroupBuyProductSpecPo groupBuyProductSpecPo) {
-
-        int flag = groupBuyProductSpecInnerServiceSMOImpl.deleteGroupBuyProductSpec(groupBuyProductSpecPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 44
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/impl/GetGroupBuyProductSpecBMOImpl.java

@@ -1,44 +0,0 @@
-package com.java110.goods.bmo.groupBuyProductSpec.impl;
-
-import com.java110.dto.groupBuyProductSpec.GroupBuyProductSpecDto;
-import com.java110.goods.bmo.groupBuyProductSpec.IGetGroupBuyProductSpecBMO;
-import com.java110.intf.goods.IGroupBuyProductSpecInnerServiceSMO;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getGroupBuyProductSpecBMOImpl")
-public class GetGroupBuyProductSpecBMOImpl implements IGetGroupBuyProductSpecBMO {
-
-    @Autowired
-    private IGroupBuyProductSpecInnerServiceSMO groupBuyProductSpecInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyProductSpecDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(GroupBuyProductSpecDto groupBuyProductSpecDto) {
-
-
-        int count = groupBuyProductSpecInnerServiceSMOImpl.queryGroupBuyProductSpecsCount(groupBuyProductSpecDto);
-
-        List<GroupBuyProductSpecDto> groupBuyProductSpecDtos = null;
-        if (count > 0) {
-            groupBuyProductSpecDtos = groupBuyProductSpecInnerServiceSMOImpl.queryGroupBuyProductSpecs(groupBuyProductSpecDto);
-        } else {
-            groupBuyProductSpecDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) groupBuyProductSpecDto.getRow()), count, groupBuyProductSpecDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-}

+ 0 - 38
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/impl/SaveGroupBuyProductSpecBMOImpl.java

@@ -1,38 +0,0 @@
-package com.java110.goods.bmo.groupBuyProductSpec.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.goods.bmo.groupBuyProductSpec.ISaveGroupBuyProductSpecBMO;
-import com.java110.intf.goods.IGroupBuyProductSpecInnerServiceSMO;
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("saveGroupBuyProductSpecBMOImpl")
-public class SaveGroupBuyProductSpecBMOImpl implements ISaveGroupBuyProductSpecBMO {
-
-    @Autowired
-    private IGroupBuyProductSpecInnerServiceSMO groupBuyProductSpecInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param groupBuyProductSpecPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(GroupBuyProductSpecPo groupBuyProductSpecPo) {
-
-        groupBuyProductSpecPo.setSpecId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_specId));
-        int flag = groupBuyProductSpecInnerServiceSMOImpl.saveGroupBuyProductSpec(groupBuyProductSpecPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/groupBuyProductSpec/impl/UpdateGroupBuyProductSpecBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.groupBuyProductSpec.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.groupBuyProductSpec.IUpdateGroupBuyProductSpecBMO;
-import com.java110.intf.goods.IGroupBuyProductSpecInnerServiceSMO;
-import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("updateGroupBuyProductSpecBMOImpl")
-public class UpdateGroupBuyProductSpecBMOImpl implements IUpdateGroupBuyProductSpecBMO {
-
-    @Autowired
-    private IGroupBuyProductSpecInnerServiceSMO groupBuyProductSpecInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuyProductSpecPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(GroupBuyProductSpecPo groupBuyProductSpecPo) {
-
-        int flag = groupBuyProductSpecInnerServiceSMOImpl.updateGroupBuyProductSpec(groupBuyProductSpecPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/IDeleteGroupBuySettingBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.groupBuySetting;
-import com.java110.po.groupBuySetting.GroupBuySettingPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteGroupBuySettingBMO {
-
-
-    /**
-     * 修改拼团设置
-     * add by wuxw
-     * @param groupBuySettingPo
-     * @return
-     */
-    ResponseEntity<String> delete(GroupBuySettingPo groupBuySettingPo);
-
-
-}

+ 0 - 16
service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/IGetGroupBuySettingBMO.java

@@ -1,16 +0,0 @@
-package com.java110.goods.bmo.groupBuySetting;
-import com.java110.dto.groupBuySetting.GroupBuySettingDto;
-import org.springframework.http.ResponseEntity;
-public interface IGetGroupBuySettingBMO {
-
-
-    /**
-     * 查询拼团设置
-     * add by wuxw
-     * @param  groupBuySettingDto
-     * @return
-     */
-    ResponseEntity<String> get(GroupBuySettingDto groupBuySettingDto);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/ISaveGroupBuySettingBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.groupBuySetting;
-
-import com.java110.po.groupBuySetting.GroupBuySettingPo;
-import org.springframework.http.ResponseEntity;
-
-public interface ISaveGroupBuySettingBMO {
-
-
-    /**
-     * 添加拼团设置
-     * add by wuxw
-     *
-     * @param groupBuySettingPo
-     * @return
-     */
-    ResponseEntity<String> save(GroupBuySettingPo groupBuySettingPo);
-
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/IUpdateGroupBuySettingBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.groupBuySetting;
-import com.java110.po.groupBuySetting.GroupBuySettingPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IUpdateGroupBuySettingBMO {
-
-
-    /**
-     * 修改拼团设置
-     * add by wuxw
-     * @param groupBuySettingPo
-     * @return
-     */
-    ResponseEntity<String> update(GroupBuySettingPo groupBuySettingPo);
-
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/impl/DeleteGroupBuySettingBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.groupBuySetting.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.groupBuySetting.IDeleteGroupBuySettingBMO;
-import com.java110.intf.goods.IGroupBuySettingInnerServiceSMO;
-import com.java110.po.groupBuySetting.GroupBuySettingPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteGroupBuySettingBMOImpl")
-public class DeleteGroupBuySettingBMOImpl implements IDeleteGroupBuySettingBMO {
-
-    @Autowired
-    private IGroupBuySettingInnerServiceSMO groupBuySettingInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuySettingPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(GroupBuySettingPo groupBuySettingPo) {
-
-        int flag = groupBuySettingInnerServiceSMOImpl.deleteGroupBuySetting(groupBuySettingPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 44
service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/impl/GetGroupBuySettingBMOImpl.java

@@ -1,44 +0,0 @@
-package com.java110.goods.bmo.groupBuySetting.impl;
-
-import com.java110.dto.groupBuySetting.GroupBuySettingDto;
-import com.java110.goods.bmo.groupBuySetting.IGetGroupBuySettingBMO;
-import com.java110.intf.goods.IGroupBuySettingInnerServiceSMO;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getGroupBuySettingBMOImpl")
-public class GetGroupBuySettingBMOImpl implements IGetGroupBuySettingBMO {
-
-    @Autowired
-    private IGroupBuySettingInnerServiceSMO groupBuySettingInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuySettingDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(GroupBuySettingDto groupBuySettingDto) {
-
-
-        int count = groupBuySettingInnerServiceSMOImpl.queryGroupBuySettingsCount(groupBuySettingDto);
-
-        List<GroupBuySettingDto> groupBuySettingDtos = null;
-        if (count > 0) {
-            groupBuySettingDtos = groupBuySettingInnerServiceSMOImpl.queryGroupBuySettings(groupBuySettingDto);
-        } else {
-            groupBuySettingDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) groupBuySettingDto.getRow()), count, groupBuySettingDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-}

+ 0 - 59
service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/impl/SaveGroupBuySettingBMOImpl.java

@@ -1,59 +0,0 @@
-package com.java110.goods.bmo.groupBuySetting.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.goods.bmo.groupBuySetting.ISaveGroupBuySettingBMO;
-
-import com.java110.intf.goods.IGroupBuyBatchInnerServiceSMO;
-import com.java110.intf.goods.IGroupBuySettingInnerServiceSMO;
-import com.java110.po.groupBuyBatch.GroupBuyBatchPo;
-import com.java110.po.groupBuySetting.GroupBuySettingPo;
-import com.java110.utils.util.DateUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.Calendar;
-
-@Service("saveGroupBuySettingBMOImpl")
-public class SaveGroupBuySettingBMOImpl implements ISaveGroupBuySettingBMO {
-
-    @Autowired
-    private IGroupBuySettingInnerServiceSMO groupBuySettingInnerServiceSMOImpl;
-
-    @Autowired
-    private IGroupBuyBatchInnerServiceSMO groupBuyBatchInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param groupBuySettingPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(GroupBuySettingPo groupBuySettingPo) {
-
-        groupBuySettingPo.setSettingId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_settingId));
-        int flag = groupBuySettingInnerServiceSMOImpl.saveGroupBuySetting(groupBuySettingPo);
-
-        if (flag < 1) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-        }
-
-        GroupBuyBatchPo groupBuyBatchPo = new GroupBuyBatchPo();
-        groupBuyBatchPo.setStoreId(groupBuySettingPo.getStoreId());
-        groupBuyBatchPo.setSettingId(groupBuySettingPo.getSettingId());
-        groupBuyBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_batchId));
-        groupBuyBatchPo.setBatchStartTime(groupBuySettingPo.getStartTime());
-        groupBuyBatchPo.setCurBatch("Y");
-        groupBuyBatchPo.setBatchEndTime(groupBuySettingPo.getEndTime());
-        flag = groupBuyBatchInnerServiceSMOImpl.saveGroupBuyBatch(groupBuyBatchPo);
-
-        if (flag < 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-        }
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-    }
-
-}

+ 0 - 61
service-goods/src/main/java/com/java110/goods/bmo/groupBuySetting/impl/UpdateGroupBuySettingBMOImpl.java

@@ -1,61 +0,0 @@
-package com.java110.goods.bmo.groupBuySetting.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.groupBuyBatch.GroupBuyBatchDto;
-import com.java110.goods.bmo.groupBuySetting.IUpdateGroupBuySettingBMO;
-
-import com.java110.intf.goods.IGroupBuyBatchInnerServiceSMO;
-import com.java110.intf.goods.IGroupBuySettingInnerServiceSMO;
-import com.java110.po.groupBuyBatch.GroupBuyBatchPo;
-import com.java110.po.groupBuySetting.GroupBuySettingPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("updateGroupBuySettingBMOImpl")
-public class UpdateGroupBuySettingBMOImpl implements IUpdateGroupBuySettingBMO {
-
-    @Autowired
-    private IGroupBuySettingInnerServiceSMO groupBuySettingInnerServiceSMOImpl;
-    @Autowired
-    private IGroupBuyBatchInnerServiceSMO groupBuyBatchInnerServiceSMOImpl;
-
-    /**
-     * @param groupBuySettingPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(GroupBuySettingPo groupBuySettingPo) {
-
-        int flag = groupBuySettingInnerServiceSMOImpl.updateGroupBuySetting(groupBuySettingPo);
-
-        if (flag < 1) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-        }
-
-        GroupBuyBatchDto groupBuyBatchDto = new GroupBuyBatchDto();
-        groupBuyBatchDto.setStoreId(groupBuySettingPo.getStoreId());
-        groupBuyBatchDto.setSettingId(groupBuySettingPo.getSettingId());
-        int count = groupBuyBatchInnerServiceSMOImpl.queryGroupBuyBatchsCount(groupBuyBatchDto);
-
-        if (count < 1) {
-            GroupBuyBatchPo groupBuyBatchPo = new GroupBuyBatchPo();
-            groupBuyBatchPo.setStoreId(groupBuySettingPo.getStoreId());
-            groupBuyBatchPo.setSettingId(groupBuySettingPo.getSettingId());
-            groupBuyBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_batchId));
-            groupBuyBatchPo.setBatchStartTime(groupBuySettingPo.getStartTime());
-            groupBuyBatchPo.setCurBatch("Y");
-            groupBuyBatchPo.setBatchEndTime(groupBuySettingPo.getEndTime());
-            flag = groupBuyBatchInnerServiceSMOImpl.saveGroupBuyBatch(groupBuyBatchPo);
-
-            if (flag < 0) {
-                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-            }
-        }
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-
-    }
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/product/IDeleteProductBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.product;
-import com.java110.po.product.ProductPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteProductBMO {
-
-
-    /**
-     * 修改产品
-     * add by wuxw
-     * @param productPo
-     * @return
-     */
-    ResponseEntity<String> delete(ProductPo productPo);
-
-
-}

+ 0 - 16
service-goods/src/main/java/com/java110/goods/bmo/product/IGetProductBMO.java

@@ -1,16 +0,0 @@
-package com.java110.goods.bmo.product;
-import com.java110.dto.product.ProductDto;
-import org.springframework.http.ResponseEntity;
-public interface IGetProductBMO {
-
-
-    /**
-     * 查询产品
-     * add by wuxw
-     * @param  productDto
-     * @return
-     */
-    ResponseEntity<String> get(ProductDto productDto);
-
-
-}

+ 0 - 24
service-goods/src/main/java/com/java110/goods/bmo/product/ISaveProductBMO.java

@@ -1,24 +0,0 @@
-package com.java110.goods.bmo.product;
-
-import com.alibaba.fastjson.JSONArray;
-import com.java110.po.product.ProductPo;
-import com.java110.po.productDetail.ProductDetailPo;
-import com.java110.po.productSpecValue.ProductSpecValuePo;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
-
-public interface ISaveProductBMO {
-
-
-    /**
-     * 添加产品
-     * add by wuxw
-     * @param productPo
-     * @return
-     */
-    ResponseEntity<String> save(ProductPo productPo, String coverPhoto, JSONArray carouselFigurePhoto,
-                                List<ProductSpecValuePo> productSpecValuePos, ProductDetailPo productDetailPo);
-
-
-}

+ 0 - 23
service-goods/src/main/java/com/java110/goods/bmo/product/IUpdateProductBMO.java

@@ -1,23 +0,0 @@
-package com.java110.goods.bmo.product;
-import com.alibaba.fastjson.JSONArray;
-import com.java110.po.product.ProductPo;
-import com.java110.po.productDetail.ProductDetailPo;
-import com.java110.po.productSpecValue.ProductSpecValuePo;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
-
-public interface IUpdateProductBMO {
-
-
-    /**
-     * 修改产品
-     * add by wuxw
-     * @param productPo
-     * @return
-     */
-    ResponseEntity<String> update(ProductPo productPo, String coverPhoto, JSONArray carouselFigurePhoto,
-                                  List<ProductSpecValuePo> productSpecValuePos, ProductDetailPo productDetailPo);
-
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/product/impl/DeleteProductBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.product.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.product.IDeleteProductBMO;
-import com.java110.intf.goods.IProductInnerServiceSMO;
-import com.java110.po.product.ProductPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteProductBMOImpl")
-public class DeleteProductBMOImpl implements IDeleteProductBMO {
-
-    @Autowired
-    private IProductInnerServiceSMO productInnerServiceSMOImpl;
-
-    /**
-     * @param productPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(ProductPo productPo) {
-
-        int flag = productInnerServiceSMOImpl.deleteProduct(productPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 209
service-goods/src/main/java/com/java110/goods/bmo/product/impl/GetProductBMOImpl.java

@@ -1,209 +0,0 @@
-package com.java110.goods.bmo.product.impl;
-
-import com.java110.dto.file.FileRelDto;
-import com.java110.dto.groupBuyProduct.GroupBuyProductDto;
-import com.java110.dto.groupBuyProductSpec.GroupBuyProductSpecDto;
-import com.java110.dto.product.ProductActivityDto;
-import com.java110.dto.product.ProductDto;
-import com.java110.dto.product.ProductSpecDetailDto;
-import com.java110.dto.productDetail.ProductDetailDto;
-import com.java110.dto.productSpecValue.ProductSpecValueDto;
-import com.java110.goods.bmo.product.IGetProductBMO;
-import com.java110.intf.common.IFileRelInnerServiceSMO;
-import com.java110.intf.goods.*;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getProductBMOImpl")
-public class GetProductBMOImpl implements IGetProductBMO {
-
-    @Autowired
-    private IProductInnerServiceSMO productInnerServiceSMOImpl;
-
-    @Autowired
-    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductDetailInnerServiceSMO productDetailInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecValueInnerServiceSMO productSpecValueInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecDetailInnerServiceSMO productSpecDetailInnerServiceSMOImpl;
-
-    @Autowired
-    private IGroupBuyProductInnerServiceSMO groupBuyProductInnerServiceSMOImpl;
-
-
-    @Autowired
-    private IGroupBuyProductSpecInnerServiceSMO groupBuyProductSpecInnerServiceSMOImpl;
-
-    /**
-     * @param productDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(ProductDto productDto) {
-
-        int count = productInnerServiceSMOImpl.queryProductsCount(productDto);
-
-        List<ProductDto> productDtos = null;
-        if (count > 0) {
-            productDtos = productInnerServiceSMOImpl.queryProducts(productDto);
-
-            freshProductDtos(productDtos, productDto);
-        } else {
-            productDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) productDto.getRow()), count, productDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-    private void freshProductDtos(List<ProductDto> productDtos, ProductDto productDto) {
-
-        if (productDtos == null || productDtos.size() < 1) {
-            return;
-        }
-
-        //输入
-        List<String> productIds = new ArrayList<>();
-
-        for (ProductDto tmpProductDto : productDtos) {
-            productIds.add(tmpProductDto.getProductId());
-        }
-
-        FileRelDto fileRelDto = new FileRelDto();
-        fileRelDto.setObjIds(productIds.toArray(new String[productIds.size()]));
-        fileRelDto.setRelTypeCd(FileRelDto.REL_TYPE_CD_GOODS_COVER);
-        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-
-        //刷入图片信息
-        List<String> photoVos = null;
-        String url = null;
-        for (ProductDto tmpProductDto : productDtos) {
-            for (FileRelDto tmpFileRelDto : fileRelDtos) {
-                if (tmpProductDto.getProductId().equals(tmpFileRelDto.getObjId())) {
-                    url = "/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=-1";
-                    tmpProductDto.setCoverPhoto(url);
-                }
-            }
-        }
-
-        //刷入库存和销量
-        ProductSpecValueDto productSpecValueDto = new ProductSpecValueDto();
-        productSpecValueDto.setStoreId(productDtos.get(0).getStoreId());
-        productSpecValueDto.setProductIds(productIds.toArray(new String[productIds.size()]));
-        List<ProductSpecValueDto> productSpecValueDtos = productSpecValueInnerServiceSMOImpl.queryProductStockAndSales(productSpecValueDto);
-        for (ProductDto tmpProduct : productDtos) {
-            for (ProductSpecValueDto tmpProdSpecValue : productSpecValueDtos) {
-                if (tmpProdSpecValue.getProductId().equals(tmpProduct.getProductId())) {
-                    tmpProduct.setSales(tmpProdSpecValue.getSales());
-                    tmpProduct.setStock(tmpProdSpecValue.getStock());
-                }
-            }
-        }
-
-        // 查询规格
-        if (productDtos.size() > 1) {
-            return;
-        }
-
-        //输入轮播图
-        fileRelDto = new FileRelDto();
-        fileRelDto.setObjId(productDtos.get(0).getProductId());
-        fileRelDto.setRelTypeCd(FileRelDto.REL_TYPE_CD_GOODS_CAROUSEL_FIGURE);
-        fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-        List<String> photos = new ArrayList<>();
-        for (ProductDto tmpProductDto : productDtos) {
-            for (FileRelDto tmpFileRelDto : fileRelDtos) {
-                if (tmpProductDto.getProductId().equals(tmpFileRelDto.getObjId())) {
-                    url = "/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=-1";
-                    photos.add(url);
-                }
-            }
-            tmpProductDto.setCarouselFigurePhotos(photos);
-        }
-
-        freshProductSpecValue(productDtos);
-        judgeGroupBuyProduct(productDtos.get(0));
-
-
-        ProductDetailDto productDetailDto = new ProductDetailDto();
-        productDetailDto.setProductId(productDtos.get(0).getProductId());
-        productDetailDto.setStoreId(productDtos.get(0).getStoreId());
-        List<ProductDetailDto> productDetailDtos = productDetailInnerServiceSMOImpl.queryProductDetails(productDetailDto);
-
-        if (productDetailDtos == null || productDetailDtos.size() < 1) {
-            return;
-        }
-
-        productDtos.get(0).setContent(productDetailDtos.get(0).getContent());
-    }
-
-    private void judgeGroupBuyProduct(ProductDto productDto) {
-        //判断商品是否 拼团
-        GroupBuyProductDto groupBuyProductDto = new GroupBuyProductDto();
-        groupBuyProductDto.setProductId(productDto.getProductId());
-        groupBuyProductDto.setStoreId(productDto.getStoreId());
-        List<GroupBuyProductDto> groupBuyProductDtos = groupBuyProductInnerServiceSMOImpl.queryGroupBuyProducts(groupBuyProductDto);
-
-        if (groupBuyProductDtos == null || groupBuyProductDtos.size() < 1) {
-            return;
-        }
-
-        productDto.setActType(ProductActivityDto.ACT_TYPE_GROUP);
-        productDto.setActEndTime(groupBuyProductDtos.get(0).getBatchEndTime());
-        productDto.setActProdName(groupBuyProductDtos.get(0).getGroupProdName());
-        productDto.setActProdDesc(groupBuyProductDtos.get(0).getGroupProdDesc());
-
-        GroupBuyProductSpecDto groupBuyProductSpecDto = new GroupBuyProductSpecDto();
-        groupBuyProductSpecDto.setStoreId(groupBuyProductDtos.get(0).getStoreId());
-        groupBuyProductSpecDto.setProductId(groupBuyProductDtos.get(0).getProductId());
-        groupBuyProductSpecInnerServiceSMOImpl.queryGroupBuyProductSpecs(groupBuyProductSpecDto);
-
-
-    }
-
-    private void freshProductSpecValue(List<ProductDto> productDtos) {
-        ProductSpecValueDto productSpecValueDto = new ProductSpecValueDto();
-        productSpecValueDto.setProductId(productDtos.get(0).getProductId());
-        productSpecValueDto.setStoreId(productDtos.get(0).getStoreId());
-        List<ProductSpecValueDto> productSpecValueDtos = productSpecValueInnerServiceSMOImpl.queryProductSpecValues(productSpecValueDto);
-
-        if (productSpecValueDtos == null || productSpecValueDtos.size() < 1) {
-            return;
-        }
-        productDtos.get(0).setProductSpecValues(productSpecValueDtos);
-
-        List<String> specIds = new ArrayList<>();
-        for (ProductSpecValueDto productSpecValue : productSpecValueDtos) {
-            specIds.add(productSpecValue.getSpecId());
-        }
-
-        ProductSpecDetailDto productSpecDetailDto = new ProductSpecDetailDto();
-        productSpecDetailDto.setSpecIds(specIds.toArray(new String[specIds.size()]));
-        productSpecDetailDto.setStoreId(productDtos.get(0).getStoreId());
-        List<ProductSpecDetailDto> productSpecDetailDtos = productSpecDetailInnerServiceSMOImpl.queryProductSpecDetails(productSpecDetailDto);
-        List<ProductSpecDetailDto> tmpProductSpecDetailDtos = null;
-        for (ProductSpecValueDto productSpecValue : productSpecValueDtos) {
-            tmpProductSpecDetailDtos = new ArrayList<>();
-            for (ProductSpecDetailDto tmpProductSpecDetailDto : productSpecDetailDtos) {
-                if (productSpecValue.getSpecId().equals(tmpProductSpecDetailDto.getSpecId())) {
-                    tmpProductSpecDetailDtos.add(tmpProductSpecDetailDto);
-                }
-            }
-            productSpecValue.setProductSpecDetails(tmpProductSpecDetailDtos);
-        }
-    }
-
-}

+ 0 - 120
service-goods/src/main/java/com/java110/goods/bmo/product/impl/SaveProductBMOImpl.java

@@ -1,120 +0,0 @@
-package com.java110.goods.bmo.product.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.file.FileDto;
-import com.java110.dto.file.FileRelDto;
-import com.java110.goods.bmo.product.ISaveProductBMO;
-import com.java110.intf.common.IFileInnerServiceSMO;
-import com.java110.intf.common.IFileRelInnerServiceSMO;
-import com.java110.intf.goods.IProductDetailInnerServiceSMO;
-import com.java110.intf.goods.IProductInnerServiceSMO;
-import com.java110.intf.goods.IProductSpecValueInnerServiceSMO;
-import com.java110.po.file.FileRelPo;
-import com.java110.po.product.ProductPo;
-import com.java110.po.productDetail.ProductDetailPo;
-import com.java110.po.productSpecValue.ProductSpecValuePo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("saveProductBMOImpl")
-public class SaveProductBMOImpl implements ISaveProductBMO {
-
-    @Autowired
-    private IProductInnerServiceSMO productInnerServiceSMOImpl;
-
-    @Autowired
-    private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
-    @Autowired
-    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecValueInnerServiceSMO productSpecValueInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductDetailInnerServiceSMO productDetailInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param productPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(ProductPo productPo, String coverPhoto, JSONArray carouselFigurePhoto,
-                                       List<ProductSpecValuePo> productSpecValuePos, ProductDetailPo productDetailPo) {
-
-        productPo.setProductId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_productId));
-        int flag = productInnerServiceSMOImpl.saveProduct(productPo);
-
-        if (flag < 1) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-        }
-
-        //保存商品封面
-        doSavaRentingFile(coverPhoto, productPo, FileRelDto.REL_TYPE_CD_GOODS_COVER);
-        for (int carouselIndex = 0; carouselIndex < carouselFigurePhoto.size(); carouselIndex++) {
-            doSavaRentingFile(carouselFigurePhoto.getString(carouselIndex), productPo, FileRelDto.REL_TYPE_CD_GOODS_CAROUSEL_FIGURE);
-        }
-
-        for (ProductSpecValuePo productSpecValuePo : productSpecValuePos) {
-            productSpecValuePo.setStoreId(productPo.getStoreId());
-            productSpecValuePo.setProductId(productPo.getProductId());
-            productSpecValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
-            flag = productSpecValueInnerServiceSMOImpl.saveProductSpecValue(productSpecValuePo);
-
-            if (flag < 1) {
-                throw new IllegalArgumentException("保存规格失败");
-            }
-        }
-
-        productDetailPo.setProductId(productPo.getProductId());
-        productDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
-
-        flag = productDetailInnerServiceSMOImpl.saveProductDetail(productDetailPo);
-        if (flag < 1) {
-            throw new IllegalArgumentException("保存规格失败");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-    }
-
-
-    /**
-     * 保存房屋租赁 图片
-     *
-     * @param photo
-     * @param productPo
-     */
-    private void doSavaRentingFile(String photo, ProductPo productPo, String fileTypeCd) {
-
-        FileDto fileDto = new FileDto();
-        fileDto.setCommunityId("-1");
-        fileDto.setContext(photo);
-        fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
-        fileDto.setFileName(fileDto.getFileId());
-
-        fileDto.setSuffix("jpeg");
-        String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
-
-        FileRelPo fileRelPo = new FileRelPo();
-        fileRelPo.setObjId(productPo.getProductId());
-        fileRelPo.setRelTypeCd(fileTypeCd);
-        fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
-        fileRelPo.setFileRealName(fileName);
-        fileRelPo.setFileSaveName(fileName);
-        fileRelPo.setSaveWay(FileRelDto.SAVE_WAY_FTP);
-        int save = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
-
-        if (save < 1) {
-            throw new IllegalArgumentException("保存文件失败");
-        }
-    }
-
-}

+ 0 - 154
service-goods/src/main/java/com/java110/goods/bmo/product/impl/UpdateProductBMOImpl.java

@@ -1,154 +0,0 @@
-package com.java110.goods.bmo.product.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.file.FileDto;
-import com.java110.dto.file.FileRelDto;
-import com.java110.dto.productDetail.ProductDetailDto;
-import com.java110.goods.bmo.product.IUpdateProductBMO;
-import com.java110.intf.common.IFileInnerServiceSMO;
-import com.java110.intf.common.IFileRelInnerServiceSMO;
-import com.java110.intf.goods.IProductDetailInnerServiceSMO;
-import com.java110.intf.goods.IProductInnerServiceSMO;
-import com.java110.intf.goods.IProductSpecValueInnerServiceSMO;
-import com.java110.po.file.FileRelPo;
-import com.java110.po.product.ProductPo;
-import com.java110.po.productDetail.ProductDetailPo;
-import com.java110.po.productSpecValue.ProductSpecValuePo;
-import com.java110.utils.util.StringUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("updateProductBMOImpl")
-public class UpdateProductBMOImpl implements IUpdateProductBMO {
-
-    @Autowired
-    private IProductInnerServiceSMO productInnerServiceSMOImpl;
-    @Autowired
-    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
-    @Autowired
-    private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecValueInnerServiceSMO productSpecValueInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductDetailInnerServiceSMO productDetailInnerServiceSMOImpl;
-
-    /**
-     * @param productPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(ProductPo productPo, String coverPhoto, JSONArray carouselFigurePhoto,
-                                         List<ProductSpecValuePo> productSpecValuePos, ProductDetailPo productDetailPo) {
-
-        int flag = productInnerServiceSMOImpl.updateProduct(productPo);
-
-//保存商品封面
-        //删除 图片
-        FileRelPo fileRelPo = new FileRelPo();
-        fileRelPo.setObjId(productPo.getProductId());
-        fileRelPo.setRelTypeCd(FileRelDto.REL_TYPE_CD_GOODS_COVER);
-        fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
-        doSavaRentingFile(coverPhoto, productPo, FileRelDto.REL_TYPE_CD_GOODS_COVER);
-
-        if (carouselFigurePhoto != null) {
-            fileRelPo = new FileRelPo();
-            fileRelPo.setObjId(productPo.getProductId());
-            fileRelPo.setRelTypeCd(FileRelDto.REL_TYPE_CD_GOODS_CAROUSEL_FIGURE);
-            fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
-            for (int carouselIndex = 0; carouselIndex < carouselFigurePhoto.size(); carouselIndex++) {
-                doSavaRentingFile(carouselFigurePhoto.getString(carouselIndex), productPo, FileRelDto.REL_TYPE_CD_GOODS_CAROUSEL_FIGURE);
-            }
-        }
-        if (productSpecValuePos != null) {
-            //删除所有 规格
-//            ProductSpecValuePo deleteProductSpecValuePo = new ProductSpecValuePo();
-//            deleteProductSpecValuePo.setStoreId(productPo.getStoreId());
-//            deleteProductSpecValuePo.setProductId(productPo.getProductId());
-//            productSpecValueInnerServiceSMOImpl.deleteProductSpecValue(deleteProductSpecValuePo);
-            for (ProductSpecValuePo productSpecValuePo : productSpecValuePos) {
-                if (StringUtil.isEmpty(productSpecValuePo.getValueId())
-                        || productSpecValuePo.getValueId().startsWith("-")) {
-                    productSpecValuePo.setStoreId(productPo.getStoreId());
-                    productSpecValuePo.setProductId(productPo.getProductId());
-                    productSpecValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
-                    flag = productSpecValueInnerServiceSMOImpl.saveProductSpecValue(productSpecValuePo);
-                    if (flag < 1) {
-                        throw new IllegalArgumentException("保存规格失败");
-                    }
-                } else {
-                    productSpecValueInnerServiceSMOImpl.updateProductSpecValue(productSpecValuePo);
-                }
-            }
-        }
-
-        if (productDetailPo == null) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-        ProductDetailDto productDetailDto = new ProductDetailDto();
-        productDetailDto.setProductId(productPo.getProductId());
-        productDetailDto.setStoreId(productPo.getStoreId());
-        List<ProductDetailDto> productDetailDtos = productDetailInnerServiceSMOImpl.queryProductDetails(productDetailDto);
-
-        if (productDetailDtos == null || productDetailDtos.size() < 1) {
-            productDetailPo.setProductId(productPo.getProductId());
-            productDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
-            flag = productDetailInnerServiceSMOImpl.saveProductDetail(productDetailPo);
-        } else {
-            productDetailPo.setProductId(productPo.getProductId());
-            flag = productDetailInnerServiceSMOImpl.updateProductDetail(productDetailPo);
-
-        }
-        if (flag < 1) {
-            throw new IllegalArgumentException("保存规格失败");
-        }
-
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-    }
-
-
-    /**
-     * 保存房屋租赁 图片
-     *
-     * @param photo
-     * @param productPo
-     */
-    private void doSavaRentingFile(String photo, ProductPo productPo, String fileTypeCd) {
-
-        if (StringUtil.isEmpty(photo)) {
-            return;
-        }
-
-
-        FileDto fileDto = new FileDto();
-        fileDto.setCommunityId("-1");
-        fileDto.setContext(photo);
-        fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
-        fileDto.setFileName(fileDto.getFileId());
-
-        fileDto.setSuffix("jpeg");
-        String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
-        FileRelPo fileRelPo = null;
-        fileRelPo = new FileRelPo();
-        fileRelPo.setObjId(productPo.getProductId());
-        fileRelPo.setRelTypeCd(fileTypeCd);
-        fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
-        fileRelPo.setFileRealName(fileName);
-        fileRelPo.setFileSaveName(fileName);
-        fileRelPo.setSaveWay(FileRelDto.SAVE_WAY_FTP);
-        int save = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
-
-        if (save < 1) {
-            throw new IllegalArgumentException("保存文件失败");
-        }
-    }
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productAttr/IDeleteProductAttrBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productAttr;
-import com.java110.po.productAttr.ProductAttrPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteProductAttrBMO {
-
-
-    /**
-     * 修改产品属性
-     * add by wuxw
-     * @param productAttrPo
-     * @return
-     */
-    ResponseEntity<String> delete(ProductAttrPo productAttrPo);
-
-
-}

+ 0 - 16
service-goods/src/main/java/com/java110/goods/bmo/productAttr/IGetProductAttrBMO.java

@@ -1,16 +0,0 @@
-package com.java110.goods.bmo.productAttr;
-import com.java110.dto.productAttr.ProductAttrDto;
-import org.springframework.http.ResponseEntity;
-public interface IGetProductAttrBMO {
-
-
-    /**
-     * 查询产品属性
-     * add by wuxw
-     * @param  productAttrDto
-     * @return
-     */
-    ResponseEntity<String> get(ProductAttrDto productAttrDto);
-
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productAttr/ISaveProductAttrBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productAttr;
-
-import com.java110.po.productAttr.ProductAttrPo;
-import org.springframework.http.ResponseEntity;
-public interface ISaveProductAttrBMO {
-
-
-    /**
-     * 添加产品属性
-     * add by wuxw
-     * @param productAttrPo
-     * @return
-     */
-    ResponseEntity<String> save(ProductAttrPo productAttrPo);
-
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productAttr/IUpdateProductAttrBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productAttr;
-import com.java110.po.productAttr.ProductAttrPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IUpdateProductAttrBMO {
-
-
-    /**
-     * 修改产品属性
-     * add by wuxw
-     * @param productAttrPo
-     * @return
-     */
-    ResponseEntity<String> update(ProductAttrPo productAttrPo);
-
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/productAttr/impl/DeleteProductAttrBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.productAttr.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.productAttr.IDeleteProductAttrBMO;
-import com.java110.intf.goods.IProductAttrInnerServiceSMO;
-import com.java110.po.productAttr.ProductAttrPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteProductAttrBMOImpl")
-public class DeleteProductAttrBMOImpl implements IDeleteProductAttrBMO {
-
-    @Autowired
-    private IProductAttrInnerServiceSMO productAttrInnerServiceSMOImpl;
-
-    /**
-     * @param productAttrPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(ProductAttrPo productAttrPo) {
-
-        int flag = productAttrInnerServiceSMOImpl.deleteProductAttr(productAttrPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 44
service-goods/src/main/java/com/java110/goods/bmo/productAttr/impl/GetProductAttrBMOImpl.java

@@ -1,44 +0,0 @@
-package com.java110.goods.bmo.productAttr.impl;
-
-import com.java110.dto.productAttr.ProductAttrDto;
-import com.java110.goods.bmo.productAttr.IGetProductAttrBMO;
-import com.java110.intf.goods.IProductAttrInnerServiceSMO;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getProductAttrBMOImpl")
-public class GetProductAttrBMOImpl implements IGetProductAttrBMO {
-
-    @Autowired
-    private IProductAttrInnerServiceSMO productAttrInnerServiceSMOImpl;
-
-    /**
-     * @param productAttrDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(ProductAttrDto productAttrDto) {
-
-
-        int count = productAttrInnerServiceSMOImpl.queryProductAttrsCount(productAttrDto);
-
-        List<ProductAttrDto> productAttrDtos = null;
-        if (count > 0) {
-            productAttrDtos = productAttrInnerServiceSMOImpl.queryProductAttrs(productAttrDto);
-        } else {
-            productAttrDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) productAttrDto.getRow()), count, productAttrDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-}

+ 0 - 38
service-goods/src/main/java/com/java110/goods/bmo/productAttr/impl/SaveProductAttrBMOImpl.java

@@ -1,38 +0,0 @@
-package com.java110.goods.bmo.productAttr.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.goods.bmo.productAttr.ISaveProductAttrBMO;
-import com.java110.intf.goods.IProductAttrInnerServiceSMO;
-import com.java110.po.productAttr.ProductAttrPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("saveProductAttrBMOImpl")
-public class SaveProductAttrBMOImpl implements ISaveProductAttrBMO {
-
-    @Autowired
-    private IProductAttrInnerServiceSMO productAttrInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param productAttrPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(ProductAttrPo productAttrPo) {
-
-        productAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
-        int flag = productAttrInnerServiceSMOImpl.saveProductAttr(productAttrPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/productAttr/impl/UpdateProductAttrBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.productAttr.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.productAttr.IUpdateProductAttrBMO;
-import com.java110.intf.goods.IProductAttrInnerServiceSMO;
-import com.java110.po.productAttr.ProductAttrPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("updateProductAttrBMOImpl")
-public class UpdateProductAttrBMOImpl implements IUpdateProductAttrBMO {
-
-    @Autowired
-    private IProductAttrInnerServiceSMO productAttrInnerServiceSMOImpl;
-
-    /**
-     * @param productAttrPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(ProductAttrPo productAttrPo) {
-
-        int flag = productAttrInnerServiceSMOImpl.updateProductAttr(productAttrPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productCategory/IDeleteProductCategoryBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productCategory;
-import com.java110.po.product.ProductCategoryPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteProductCategoryBMO {
-
-
-    /**
-     * 修改产品目录
-     * add by wuxw
-     * @param productCategoryPo
-     * @return
-     */
-    ResponseEntity<String> delete(ProductCategoryPo productCategoryPo);
-
-
-}

+ 0 - 16
service-goods/src/main/java/com/java110/goods/bmo/productCategory/IGetProductCategoryBMO.java

@@ -1,16 +0,0 @@
-package com.java110.goods.bmo.productCategory;
-import com.java110.dto.product.ProductCategoryDto;
-import org.springframework.http.ResponseEntity;
-public interface IGetProductCategoryBMO {
-
-
-    /**
-     * 查询产品目录
-     * add by wuxw
-     * @param  productCategoryDto
-     * @return
-     */
-    ResponseEntity<String> get(ProductCategoryDto productCategoryDto);
-
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productCategory/ISaveProductCategoryBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productCategory;
-
-import com.java110.po.product.ProductCategoryPo;
-import org.springframework.http.ResponseEntity;
-public interface ISaveProductCategoryBMO {
-
-
-    /**
-     * 添加产品目录
-     * add by wuxw
-     * @param productCategoryPo
-     * @return
-     */
-    ResponseEntity<String> save(ProductCategoryPo productCategoryPo);
-
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productCategory/IUpdateProductCategoryBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productCategory;
-import com.java110.po.product.ProductCategoryPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IUpdateProductCategoryBMO {
-
-
-    /**
-     * 修改产品目录
-     * add by wuxw
-     * @param productCategoryPo
-     * @return
-     */
-    ResponseEntity<String> update(ProductCategoryPo productCategoryPo);
-
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/productCategory/impl/DeleteProductCategoryBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.productCategory.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.productCategory.IDeleteProductCategoryBMO;
-import com.java110.intf.goods.IProductCategoryInnerServiceSMO;
-import com.java110.po.product.ProductCategoryPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteProductCategoryBMOImpl")
-public class DeleteProductCategoryBMOImpl implements IDeleteProductCategoryBMO {
-
-    @Autowired
-    private IProductCategoryInnerServiceSMO productCategoryInnerServiceSMOImpl;
-
-    /**
-     * @param productCategoryPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(ProductCategoryPo productCategoryPo) {
-
-        int flag = productCategoryInnerServiceSMOImpl.deleteProductCategory(productCategoryPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 44
service-goods/src/main/java/com/java110/goods/bmo/productCategory/impl/GetProductCategoryBMOImpl.java

@@ -1,44 +0,0 @@
-package com.java110.goods.bmo.productCategory.impl;
-
-import com.java110.dto.product.ProductCategoryDto;
-import com.java110.goods.bmo.productCategory.IGetProductCategoryBMO;
-import com.java110.intf.goods.IProductCategoryInnerServiceSMO;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getProductCategoryBMOImpl")
-public class GetProductCategoryBMOImpl implements IGetProductCategoryBMO {
-
-    @Autowired
-    private IProductCategoryInnerServiceSMO productCategoryInnerServiceSMOImpl;
-
-    /**
-     * @param productCategoryDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(ProductCategoryDto productCategoryDto) {
-
-
-        int count = productCategoryInnerServiceSMOImpl.queryProductCategorysCount(productCategoryDto);
-
-        List<ProductCategoryDto> productCategoryDtos = null;
-        if (count > 0) {
-            productCategoryDtos = productCategoryInnerServiceSMOImpl.queryProductCategorys(productCategoryDto);
-        } else {
-            productCategoryDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) productCategoryDto.getRow()), count, productCategoryDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-}

+ 0 - 38
service-goods/src/main/java/com/java110/goods/bmo/productCategory/impl/SaveProductCategoryBMOImpl.java

@@ -1,38 +0,0 @@
-package com.java110.goods.bmo.productCategory.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.goods.bmo.productCategory.ISaveProductCategoryBMO;
-import com.java110.intf.goods.IProductCategoryInnerServiceSMO;
-import com.java110.po.product.ProductCategoryPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("saveProductCategoryBMOImpl")
-public class SaveProductCategoryBMOImpl implements ISaveProductCategoryBMO {
-
-    @Autowired
-    private IProductCategoryInnerServiceSMO productCategoryInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param productCategoryPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(ProductCategoryPo productCategoryPo) {
-
-        productCategoryPo.setCategoryId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_categoryId));
-        int flag = productCategoryInnerServiceSMOImpl.saveProductCategory(productCategoryPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/productCategory/impl/UpdateProductCategoryBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.productCategory.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.productCategory.IUpdateProductCategoryBMO;
-import com.java110.intf.goods.IProductCategoryInnerServiceSMO;
-import com.java110.po.product.ProductCategoryPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("updateProductCategoryBMOImpl")
-public class UpdateProductCategoryBMOImpl implements IUpdateProductCategoryBMO {
-
-    @Autowired
-    private IProductCategoryInnerServiceSMO productCategoryInnerServiceSMOImpl;
-
-    /**
-     * @param productCategoryPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(ProductCategoryPo productCategoryPo) {
-
-        int flag = productCategoryInnerServiceSMOImpl.updateProductCategory(productCategoryPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productDetail/IDeleteProductDetailBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productDetail;
-import com.java110.po.productDetail.ProductDetailPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteProductDetailBMO {
-
-
-    /**
-     * 修改产品属性
-     * add by wuxw
-     * @param productDetailPo
-     * @return
-     */
-    ResponseEntity<String> delete(ProductDetailPo productDetailPo);
-
-
-}

+ 0 - 16
service-goods/src/main/java/com/java110/goods/bmo/productDetail/IGetProductDetailBMO.java

@@ -1,16 +0,0 @@
-package com.java110.goods.bmo.productDetail;
-import com.java110.dto.productDetail.ProductDetailDto;
-import org.springframework.http.ResponseEntity;
-public interface IGetProductDetailBMO {
-
-
-    /**
-     * 查询产品属性
-     * add by wuxw
-     * @param  productDetailDto
-     * @return
-     */
-    ResponseEntity<String> get(ProductDetailDto productDetailDto);
-
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productDetail/ISaveProductDetailBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productDetail;
-
-import com.java110.po.productDetail.ProductDetailPo;
-import org.springframework.http.ResponseEntity;
-public interface ISaveProductDetailBMO {
-
-
-    /**
-     * 添加产品属性
-     * add by wuxw
-     * @param productDetailPo
-     * @return
-     */
-    ResponseEntity<String> save(ProductDetailPo productDetailPo);
-
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productDetail/IUpdateProductDetailBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productDetail;
-import com.java110.po.productDetail.ProductDetailPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IUpdateProductDetailBMO {
-
-
-    /**
-     * 修改产品属性
-     * add by wuxw
-     * @param productDetailPo
-     * @return
-     */
-    ResponseEntity<String> update(ProductDetailPo productDetailPo);
-
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/productDetail/impl/DeleteProductDetailBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.productDetail.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.productDetail.IDeleteProductDetailBMO;
-import com.java110.intf.goods.IProductDetailInnerServiceSMO;
-import com.java110.po.productDetail.ProductDetailPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteProductDetailBMOImpl")
-public class DeleteProductDetailBMOImpl implements IDeleteProductDetailBMO {
-
-    @Autowired
-    private IProductDetailInnerServiceSMO productDetailInnerServiceSMOImpl;
-
-    /**
-     * @param productDetailPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(ProductDetailPo productDetailPo) {
-
-        int flag = productDetailInnerServiceSMOImpl.deleteProductDetail(productDetailPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 44
service-goods/src/main/java/com/java110/goods/bmo/productDetail/impl/GetProductDetailBMOImpl.java

@@ -1,44 +0,0 @@
-package com.java110.goods.bmo.productDetail.impl;
-
-import com.java110.dto.productDetail.ProductDetailDto;
-import com.java110.goods.bmo.productDetail.IGetProductDetailBMO;
-import com.java110.intf.goods.IProductDetailInnerServiceSMO;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getProductDetailBMOImpl")
-public class GetProductDetailBMOImpl implements IGetProductDetailBMO {
-
-    @Autowired
-    private IProductDetailInnerServiceSMO productDetailInnerServiceSMOImpl;
-
-    /**
-     * @param productDetailDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(ProductDetailDto productDetailDto) {
-
-
-        int count = productDetailInnerServiceSMOImpl.queryProductDetailsCount(productDetailDto);
-
-        List<ProductDetailDto> productDetailDtos = null;
-        if (count > 0) {
-            productDetailDtos = productDetailInnerServiceSMOImpl.queryProductDetails(productDetailDto);
-        } else {
-            productDetailDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) productDetailDto.getRow()), count, productDetailDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-}

+ 0 - 38
service-goods/src/main/java/com/java110/goods/bmo/productDetail/impl/SaveProductDetailBMOImpl.java

@@ -1,38 +0,0 @@
-package com.java110.goods.bmo.productDetail.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.goods.bmo.productDetail.ISaveProductDetailBMO;
-import com.java110.intf.goods.IProductDetailInnerServiceSMO;
-import com.java110.po.productDetail.ProductDetailPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("saveProductDetailBMOImpl")
-public class SaveProductDetailBMOImpl implements ISaveProductDetailBMO {
-
-    @Autowired
-    private IProductDetailInnerServiceSMO productDetailInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param productDetailPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(ProductDetailPo productDetailPo) {
-
-        productDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
-        int flag = productDetailInnerServiceSMOImpl.saveProductDetail(productDetailPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/productDetail/impl/UpdateProductDetailBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.productDetail.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.productDetail.IUpdateProductDetailBMO;
-import com.java110.intf.goods.IProductDetailInnerServiceSMO;
-import com.java110.po.productDetail.ProductDetailPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("updateProductDetailBMOImpl")
-public class UpdateProductDetailBMOImpl implements IUpdateProductDetailBMO {
-
-    @Autowired
-    private IProductDetailInnerServiceSMO productDetailInnerServiceSMOImpl;
-
-    /**
-     * @param productDetailPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(ProductDetailPo productDetailPo) {
-
-        int flag = productDetailInnerServiceSMOImpl.updateProductDetail(productDetailPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productLabel/IDeleteProductLabelBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productLabel;
-import com.java110.po.productLabel.ProductLabelPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteProductLabelBMO {
-
-
-    /**
-     * 修改产品标签
-     * add by wuxw
-     * @param productLabelPo
-     * @return
-     */
-    ResponseEntity<String> delete(ProductLabelPo productLabelPo);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/productLabel/IGetProductLabelBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.productLabel;
-
-import com.java110.dto.productLabel.ProductLabelDto;
-import org.springframework.http.ResponseEntity;
-
-public interface IGetProductLabelBMO {
-
-
-    /**
-     * 查询产品标签
-     * add by wuxw
-     *
-     * @param productLabelDto
-     * @return
-     */
-    ResponseEntity<String> get(ProductLabelDto productLabelDto);
-
-
-}

+ 0 - 19
service-goods/src/main/java/com/java110/goods/bmo/productLabel/ISaveProductLabelBMO.java

@@ -1,19 +0,0 @@
-package com.java110.goods.bmo.productLabel;
-
-import com.java110.po.productLabel.ProductLabelPo;
-import org.springframework.http.ResponseEntity;
-
-public interface ISaveProductLabelBMO {
-
-
-    /**
-     * 添加产品标签
-     * add by wuxw
-     *
-     * @param productLabelPo
-     * @return
-     */
-    ResponseEntity<String> save(ProductLabelPo productLabelPo);
-
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productLabel/IUpdateProductLabelBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productLabel;
-import com.java110.po.productLabel.ProductLabelPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IUpdateProductLabelBMO {
-
-
-    /**
-     * 修改产品标签
-     * add by wuxw
-     * @param productLabelPo
-     * @return
-     */
-    ResponseEntity<String> update(ProductLabelPo productLabelPo);
-
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/productLabel/impl/DeleteProductLabelBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.productLabel.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.productLabel.IDeleteProductLabelBMO;
-import com.java110.intf.goods.IProductLabelInnerServiceSMO;
-import com.java110.po.productLabel.ProductLabelPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteProductLabelBMOImpl")
-public class DeleteProductLabelBMOImpl implements IDeleteProductLabelBMO {
-
-    @Autowired
-    private IProductLabelInnerServiceSMO productLabelInnerServiceSMOImpl;
-
-    /**
-     * @param productLabelPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(ProductLabelPo productLabelPo) {
-
-        int flag = productLabelInnerServiceSMOImpl.deleteProductLabel(productLabelPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 128
service-goods/src/main/java/com/java110/goods/bmo/productLabel/impl/GetProductLabelBMOImpl.java

@@ -1,128 +0,0 @@
-package com.java110.goods.bmo.productLabel.impl;
-
-import com.java110.dto.file.FileRelDto;
-import com.java110.dto.product.ProductDto;
-import com.java110.dto.product.ProductSpecDetailDto;
-import com.java110.dto.productDetail.ProductDetailDto;
-import com.java110.dto.productLabel.ProductLabelDto;
-import com.java110.dto.productSpecValue.ProductSpecValueDto;
-import com.java110.goods.bmo.productLabel.IGetProductLabelBMO;
-import com.java110.intf.common.IFileRelInnerServiceSMO;
-import com.java110.intf.goods.IProductLabelInnerServiceSMO;
-import com.java110.intf.goods.IProductSpecDetailInnerServiceSMO;
-import com.java110.intf.goods.IProductSpecValueInnerServiceSMO;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getProductLabelBMOImpl")
-public class GetProductLabelBMOImpl implements IGetProductLabelBMO {
-
-    @Autowired
-    private IProductLabelInnerServiceSMO productLabelInnerServiceSMOImpl;
-
-    @Autowired
-    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecValueInnerServiceSMO productSpecValueInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecDetailInnerServiceSMO productSpecDetailInnerServiceSMOImpl;
-
-    /**
-     * @param productLabelDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(ProductLabelDto productLabelDto) {
-
-
-        int count = productLabelInnerServiceSMOImpl.queryProductLabelsCount(productLabelDto);
-
-        List<ProductLabelDto> productLabelDtos = null;
-        if (count > 0) {
-            productLabelDtos = productLabelInnerServiceSMOImpl.queryProductLabels(productLabelDto);
-            freshProductDtos(productLabelDtos,productLabelDto);
-        } else {
-            productLabelDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) productLabelDto.getRow()), count, productLabelDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-
-    private void freshProductDtos(List<ProductLabelDto> productDtos, ProductDto productDto) {
-
-        if (productDtos == null || productDtos.size() < 1) {
-            return;
-        }
-
-        //输入
-        List<String> productIds = new ArrayList<>();
-
-        for (ProductDto tmpProductDto : productDtos) {
-            productIds.add(tmpProductDto.getProductId());
-        }
-
-        FileRelDto fileRelDto = new FileRelDto();
-        fileRelDto.setObjIds(productIds.toArray(new String[productIds.size()]));
-        fileRelDto.setRelTypeCd(FileRelDto.REL_TYPE_CD_GOODS_COVER);
-        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-
-        //刷入图片信息
-        List<String> photoVos = null;
-        String url = null;
-        for (ProductDto tmpProductDto : productDtos) {
-            for (FileRelDto tmpFileRelDto : fileRelDtos) {
-                if (tmpProductDto.getProductId().equals(tmpFileRelDto.getObjId())) {
-                    url = "/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=-1";
-                    tmpProductDto.setCoverPhoto(url);
-                }
-            }
-        }
-        freshProductSpecValue(productDtos);
-
-    }
-
-    private void freshProductSpecValue(List<ProductLabelDto> productDtos) {
-        ProductSpecValueDto productSpecValueDto = new ProductSpecValueDto();
-        productSpecValueDto.setProductId(productDtos.get(0).getProductId());
-        productSpecValueDto.setStoreId(productDtos.get(0).getStoreId());
-        List<ProductSpecValueDto> productSpecValueDtos = productSpecValueInnerServiceSMOImpl.queryProductSpecValues(productSpecValueDto);
-
-        if (productSpecValueDtos == null || productSpecValueDtos.size() < 1) {
-            return;
-        }
-        productDtos.get(0).setProductSpecValues(productSpecValueDtos);
-
-        List<String> specIds = new ArrayList<>();
-        for (ProductSpecValueDto productSpecValue : productSpecValueDtos) {
-            specIds.add(productSpecValue.getSpecId());
-        }
-
-        ProductSpecDetailDto productSpecDetailDto = new ProductSpecDetailDto();
-        productSpecDetailDto.setSpecIds(specIds.toArray(new String[specIds.size()]));
-        productSpecDetailDto.setStoreId(productDtos.get(0).getStoreId());
-        List<ProductSpecDetailDto> productSpecDetailDtos = productSpecDetailInnerServiceSMOImpl.queryProductSpecDetails(productSpecDetailDto);
-        List<ProductSpecDetailDto> tmpProductSpecDetailDtos = null;
-        for (ProductSpecValueDto productSpecValue : productSpecValueDtos) {
-            tmpProductSpecDetailDtos = new ArrayList<>();
-            for (ProductSpecDetailDto tmpProductSpecDetailDto : productSpecDetailDtos) {
-                if (productSpecValue.getSpecId().equals(tmpProductSpecDetailDto.getSpecId())) {
-                    tmpProductSpecDetailDtos.add(tmpProductSpecDetailDto);
-                }
-            }
-            productSpecValue.setProductSpecDetails(tmpProductSpecDetailDtos);
-        }
-    }
-
-}

+ 0 - 38
service-goods/src/main/java/com/java110/goods/bmo/productLabel/impl/SaveProductLabelBMOImpl.java

@@ -1,38 +0,0 @@
-package com.java110.goods.bmo.productLabel.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.goods.bmo.productLabel.ISaveProductLabelBMO;
-import com.java110.intf.goods.IProductLabelInnerServiceSMO;
-import com.java110.po.productLabel.ProductLabelPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("saveProductLabelBMOImpl")
-public class SaveProductLabelBMOImpl implements ISaveProductLabelBMO {
-
-    @Autowired
-    private IProductLabelInnerServiceSMO productLabelInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param productLabelPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(ProductLabelPo productLabelPo) {
-
-        productLabelPo.setLabelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_labelId));
-        int flag = productLabelInnerServiceSMOImpl.saveProductLabel(productLabelPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 34
service-goods/src/main/java/com/java110/goods/bmo/productLabel/impl/UpdateProductLabelBMOImpl.java

@@ -1,34 +0,0 @@
-package com.java110.goods.bmo.productLabel.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.productLabel.IUpdateProductLabelBMO;
-import com.java110.intf.goods.IProductLabelInnerServiceSMO;
-import com.java110.po.productLabel.ProductLabelPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("updateProductLabelBMOImpl")
-public class UpdateProductLabelBMOImpl implements IUpdateProductLabelBMO {
-
-    @Autowired
-    private IProductLabelInnerServiceSMO productLabelInnerServiceSMOImpl;
-
-    /**
-     * @param productLabelPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(ProductLabelPo productLabelPo) {
-
-        int flag = productLabelInnerServiceSMOImpl.updateProductLabel(productLabelPo);
-
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-    }
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productSpec/IDeleteProductSpecBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productSpec;
-import com.java110.po.product.ProductSpecPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteProductSpecBMO {
-
-
-    /**
-     * 修改产品规格
-     * add by wuxw
-     * @param productSpecPo
-     * @return
-     */
-    ResponseEntity<String> delete(ProductSpecPo productSpecPo);
-
-
-}

+ 0 - 16
service-goods/src/main/java/com/java110/goods/bmo/productSpec/IGetProductSpecBMO.java

@@ -1,16 +0,0 @@
-package com.java110.goods.bmo.productSpec;
-import com.java110.dto.product.ProductSpecDto;
-import org.springframework.http.ResponseEntity;
-public interface IGetProductSpecBMO {
-
-
-    /**
-     * 查询产品规格
-     * add by wuxw
-     * @param  productSpecDto
-     * @return
-     */
-    ResponseEntity<String> get(ProductSpecDto productSpecDto);
-
-
-}

+ 0 - 21
service-goods/src/main/java/com/java110/goods/bmo/productSpec/ISaveProductSpecBMO.java

@@ -1,21 +0,0 @@
-package com.java110.goods.bmo.productSpec;
-
-import com.java110.po.product.ProductSpecDetailPo;
-import com.java110.po.product.ProductSpecPo;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
-
-public interface ISaveProductSpecBMO {
-
-
-    /**
-     * 添加产品规格
-     * add by wuxw
-     * @param productSpecPo
-     * @return
-     */
-    ResponseEntity<String> save(ProductSpecPo productSpecPo, List<ProductSpecDetailPo> productSpecDetailPos);
-
-
-}

+ 0 - 20
service-goods/src/main/java/com/java110/goods/bmo/productSpec/IUpdateProductSpecBMO.java

@@ -1,20 +0,0 @@
-package com.java110.goods.bmo.productSpec;
-import com.java110.po.product.ProductSpecDetailPo;
-import com.java110.po.product.ProductSpecPo;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
-
-public interface IUpdateProductSpecBMO {
-
-
-    /**
-     * 修改产品规格
-     * add by wuxw
-     * @param productSpecPo
-     * @return
-     */
-    ResponseEntity<String> update(ProductSpecPo productSpecPo, List<ProductSpecDetailPo> productSpecDetailPos);
-
-
-}

+ 0 - 48
service-goods/src/main/java/com/java110/goods/bmo/productSpec/impl/DeleteProductSpecBMOImpl.java

@@ -1,48 +0,0 @@
-package com.java110.goods.bmo.productSpec.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.goods.bmo.productSpec.IDeleteProductSpecBMO;
-import com.java110.intf.goods.IProductSpecDetailInnerServiceSMO;
-import com.java110.intf.goods.IProductSpecInnerServiceSMO;
-import com.java110.po.product.ProductSpecDetailPo;
-import com.java110.po.product.ProductSpecPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-@Service("deleteProductSpecBMOImpl")
-public class DeleteProductSpecBMOImpl implements IDeleteProductSpecBMO {
-
-    @Autowired
-    private IProductSpecInnerServiceSMO productSpecInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecDetailInnerServiceSMO productSpecDetailInnerServiceSMOImpl;
-
-    /**
-     * @param productSpecPo 数据
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> delete(ProductSpecPo productSpecPo) {
-
-        int flag = productSpecInnerServiceSMOImpl.deleteProductSpec(productSpecPo);
-
-        if (flag < 1) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "删除失败");
-
-        }
-        ProductSpecDetailPo tmpProductSpecDetailPo = new ProductSpecDetailPo();
-        tmpProductSpecDetailPo.setSpecId(productSpecPo.getSpecId());
-        tmpProductSpecDetailPo.setStoreId(productSpecPo.getStoreId());
-        flag = productSpecDetailInnerServiceSMOImpl.deleteProductSpecDetail(tmpProductSpecDetailPo);
-
-        if (flag < 1) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "删除失败");
-        }
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "删除失败");
-
-    }
-
-}

+ 0 - 75
service-goods/src/main/java/com/java110/goods/bmo/productSpec/impl/GetProductSpecBMOImpl.java

@@ -1,75 +0,0 @@
-package com.java110.goods.bmo.productSpec.impl;
-
-import com.java110.dto.product.ProductSpecDetailDto;
-import com.java110.dto.product.ProductSpecDto;
-import com.java110.goods.bmo.productSpec.IGetProductSpecBMO;
-import com.java110.intf.goods.IProductSpecDetailInnerServiceSMO;
-import com.java110.intf.goods.IProductSpecInnerServiceSMO;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("getProductSpecBMOImpl")
-public class GetProductSpecBMOImpl implements IGetProductSpecBMO {
-
-    @Autowired
-    private IProductSpecInnerServiceSMO productSpecInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecDetailInnerServiceSMO productSpecDetailInnerServiceSMOImpl;
-
-    /**
-     * @param productSpecDto
-     * @return 订单服务能够接受的报文
-     */
-    public ResponseEntity<String> get(ProductSpecDto productSpecDto) {
-
-        int count = productSpecInnerServiceSMOImpl.queryProductSpecsCount(productSpecDto);
-
-        List<ProductSpecDto> productSpecDtos = null;
-        if (count > 0) {
-            productSpecDtos = productSpecInnerServiceSMOImpl.queryProductSpecs(productSpecDto);
-            freshSpecDetail(productSpecDtos);
-        } else {
-            productSpecDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) productSpecDto.getRow()), count, productSpecDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
-    }
-
-    private void freshSpecDetail(List<ProductSpecDto> productSpecDtos) {
-
-        if (productSpecDtos == null || productSpecDtos.size() < 1) {
-            return;
-        }
-        List<String> specIds = new ArrayList<>();
-        for (ProductSpecDto productSpecDto : productSpecDtos) {
-            specIds.add(productSpecDto.getSpecId());
-        }
-
-        ProductSpecDetailDto productSpecDetailDto = new ProductSpecDetailDto();
-        productSpecDetailDto.setSpecIds(specIds.toArray(new String[specIds.size()]));
-        productSpecDetailDto.setStoreId(productSpecDtos.get(0).getStoreId());
-        List<ProductSpecDetailDto> productSpecDetailDtos = productSpecDetailInnerServiceSMOImpl.queryProductSpecDetails(productSpecDetailDto);
-        List<ProductSpecDetailDto> tmpProductSpecDetailDtos = null;
-        for (ProductSpecDto productSpecDto : productSpecDtos) {
-            tmpProductSpecDetailDtos = new ArrayList<>();
-            for (ProductSpecDetailDto tmpProductSpecDetailDto : productSpecDetailDtos) {
-                if (productSpecDto.getSpecId().equals(tmpProductSpecDetailDto.getSpecId())) {
-                    tmpProductSpecDetailDtos.add(tmpProductSpecDetailDto);
-                }
-            }
-            productSpecDto.setProductSpecDetails(tmpProductSpecDetailDtos);
-        }
-    }
-
-}

+ 0 - 57
service-goods/src/main/java/com/java110/goods/bmo/productSpec/impl/SaveProductSpecBMOImpl.java

@@ -1,57 +0,0 @@
-package com.java110.goods.bmo.productSpec.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.goods.bmo.productSpec.ISaveProductSpecBMO;
-import com.java110.intf.goods.IProductSpecDetailInnerServiceSMO;
-import com.java110.intf.goods.IProductSpecInnerServiceSMO;
-import com.java110.po.product.ProductSpecDetailPo;
-import com.java110.po.product.ProductSpecPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("saveProductSpecBMOImpl")
-public class SaveProductSpecBMOImpl implements ISaveProductSpecBMO {
-
-    @Autowired
-    private IProductSpecInnerServiceSMO productSpecInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecDetailInnerServiceSMO productSpecDetailInnerServiceSMOImpl;
-
-    /**
-     * 添加小区信息
-     *
-     * @param productSpecPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> save(ProductSpecPo productSpecPo, List<ProductSpecDetailPo> productSpecDetailPos) {
-
-        productSpecPo.setSpecId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_specId));
-        int flag = productSpecInnerServiceSMOImpl.saveProductSpec(productSpecPo);
-
-        if (flag < 1) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-        }
-
-        for (ProductSpecDetailPo productSpecDetailPo : productSpecDetailPos) {
-            productSpecDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
-            productSpecDetailPo.setStoreId(productSpecPo.getStoreId());
-            productSpecDetailPo.setSpecId(productSpecPo.getSpecId());
-            flag = productSpecDetailInnerServiceSMOImpl.saveProductSpecDetail(productSpecDetailPo);
-
-            if (flag < 1) {
-                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存规格失败");
-            }
-        }
-
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-
-    }
-
-}

+ 0 - 61
service-goods/src/main/java/com/java110/goods/bmo/productSpec/impl/UpdateProductSpecBMOImpl.java

@@ -1,61 +0,0 @@
-package com.java110.goods.bmo.productSpec.impl;
-
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.goods.bmo.productSpec.IUpdateProductSpecBMO;
-import com.java110.intf.goods.IProductSpecDetailInnerServiceSMO;
-import com.java110.intf.goods.IProductSpecInnerServiceSMO;
-import com.java110.po.product.ProductSpecDetailPo;
-import com.java110.po.product.ProductSpecPo;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("updateProductSpecBMOImpl")
-public class UpdateProductSpecBMOImpl implements IUpdateProductSpecBMO {
-
-    @Autowired
-    private IProductSpecInnerServiceSMO productSpecInnerServiceSMOImpl;
-
-    @Autowired
-    private IProductSpecDetailInnerServiceSMO productSpecDetailInnerServiceSMOImpl;
-
-    /**
-     * @param productSpecPo
-     * @return 订单服务能够接受的报文
-     */
-    @Java110Transactional
-    public ResponseEntity<String> update(ProductSpecPo productSpecPo, List<ProductSpecDetailPo> productSpecDetailPos) {
-
-        int flag = productSpecInnerServiceSMOImpl.updateProductSpec(productSpecPo);
-
-        if (flag < 1) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-        }
-
-        ProductSpecDetailPo tmpProductSpecDetailPo = new ProductSpecDetailPo();
-        tmpProductSpecDetailPo.setSpecId(productSpecPo.getSpecId());
-        tmpProductSpecDetailPo.setStoreId(productSpecPo.getStoreId());
-        flag = productSpecDetailInnerServiceSMOImpl.deleteProductSpecDetail(tmpProductSpecDetailPo);
-
-        if (flag < 1) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
-        }
-
-
-        for (ProductSpecDetailPo productSpecDetailPo : productSpecDetailPos) {
-            productSpecDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
-            productSpecDetailPo.setStoreId(productSpecPo.getStoreId());
-            productSpecDetailPo.setSpecId(productSpecPo.getSpecId());
-            flag = productSpecDetailInnerServiceSMOImpl.saveProductSpecDetail(productSpecDetailPo);
-            if (flag < 1) {
-                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存规格失败");
-            }
-        }
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
-    }
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productSpecDetail/IDeleteProductSpecDetailBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productSpecDetail;
-import com.java110.po.product.ProductSpecDetailPo;
-import org.springframework.http.ResponseEntity;
-
-public interface IDeleteProductSpecDetailBMO {
-
-
-    /**
-     * 修改产品规格明细
-     * add by wuxw
-     * @param productSpecDetailPo
-     * @return
-     */
-    ResponseEntity<String> delete(ProductSpecDetailPo productSpecDetailPo);
-
-
-}

+ 0 - 16
service-goods/src/main/java/com/java110/goods/bmo/productSpecDetail/IGetProductSpecDetailBMO.java

@@ -1,16 +0,0 @@
-package com.java110.goods.bmo.productSpecDetail;
-import com.java110.dto.product.ProductSpecDetailDto;
-import org.springframework.http.ResponseEntity;
-public interface IGetProductSpecDetailBMO {
-
-
-    /**
-     * 查询产品规格明细
-     * add by wuxw
-     * @param  productSpecDetailDto
-     * @return
-     */
-    ResponseEntity<String> get(ProductSpecDetailDto productSpecDetailDto);
-
-
-}

+ 0 - 17
service-goods/src/main/java/com/java110/goods/bmo/productSpecDetail/ISaveProductSpecDetailBMO.java

@@ -1,17 +0,0 @@
-package com.java110.goods.bmo.productSpecDetail;
-
-import com.java110.po.product.ProductSpecDetailPo;
-import org.springframework.http.ResponseEntity;
-public interface ISaveProductSpecDetailBMO {
-
-
-    /**
-     * 添加产品规格明细
-     * add by wuxw
-     * @param productSpecDetailPo
-     * @return
-     */
-    ResponseEntity<String> save(ProductSpecDetailPo productSpecDetailPo);
-
-
-}

+ 0 - 0
service-goods/src/main/java/com/java110/goods/bmo/productSpecDetail/IUpdateProductSpecDetailBMO.java


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio