呵呵老后台列表

src/main/java/com/caimei365/manager/controller/hehe/product/HeHeProductApi.java

@@ -5,13 +5,10 @@ import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.hehe.product.*;
 import com.caimei365.manager.service.hehe.product.HeHeProductService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @RestController
 @RequestMapping("/HeHe")
@@ -29,9 +26,7 @@ public class HeHeProductApi {
      * @return
      */
     @GetMapping("/product/list")
-    public ResponseJson<PaginationVo<HeHeProduct>> userList(HeHeProduct product,
-                                                            @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+    public ResponseJson<PaginationVo<HeHeProduct>> userList(HeHeProduct product, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return productService.productList(product, pageNum, pageSize);
     }
 
@@ -44,9 +39,7 @@ public class HeHeProductApi {
      * @return
      */
     @GetMapping("/product/bigType")
-    public ResponseJson<PaginationVo<HeHeBigType>> getBigType(HeHeBigType type,
-                                                              @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                              @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+    public ResponseJson<PaginationVo<HeHeBigType>> getBigType(HeHeBigType type, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return productService.bigTypeList(type, pageNum, pageSize);
     }
 
@@ -59,9 +52,7 @@ public class HeHeProductApi {
      * @return
      */
     @GetMapping("/product/active")
-    public ResponseJson<PaginationVo<HeHeActivity>> getActiveList(HeHeActivity activity,
-                                                                  @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                  @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+    public ResponseJson<PaginationVo<HeHeActivity>> getActiveList(HeHeActivity activity, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return productService.activeList(activity, pageNum, pageSize);
     }
 
@@ -74,9 +65,7 @@ public class HeHeProductApi {
      * @return
      */
     @GetMapping("/discount/activity")
-    public ResponseJson<PaginationVo<DiscountActivity>> getActive(DiscountActivity activity,
-                                                                  @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                  @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+    public ResponseJson<PaginationVo<DiscountActivity>> getActive(DiscountActivity activity, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return productService.discountActiveList(activity, pageNum, pageSize);
     }
 
@@ -89,9 +78,7 @@ public class HeHeProductApi {
      * @return
      */
     @GetMapping("/reduction/list")
-    public ResponseJson<PaginationVo<ShareReduction>> getReduction(ShareReduction reduction,
-                                                                   @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                   @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+    public ResponseJson<PaginationVo<ShareReduction>> getReduction(ShareReduction reduction, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return productService.shareReductionList(reduction, pageNum, pageSize);
     }
 
@@ -104,9 +91,7 @@ public class HeHeProductApi {
      * @return
      */
     @GetMapping("/inside/discount")
-    public ResponseJson<PaginationVo<InsideDiscount>> insideDiscount(InsideDiscount discount,
-                                                                     @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                     @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+    public ResponseJson<PaginationVo<InsideDiscount>> insideDiscount(InsideDiscount discount, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return productService.insideDiscountList(discount, pageNum, pageSize);
     }
 
@@ -119,9 +104,7 @@ public class HeHeProductApi {
      * @return
      */
     @GetMapping("/collage/product")
-    public ResponseJson<PaginationVo<CollageProduct>> CollageProductList(CollageProduct collage,
-                                                                         @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                         @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+    public ResponseJson<PaginationVo<CollageProduct>> CollageProductList(CollageProduct collage, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return productService.CollageProductList(collage, pageNum, pageSize);
     }
 
@@ -134,9 +117,7 @@ public class HeHeProductApi {
      * @return
      */
     @GetMapping("/collage/record")
-    public ResponseJson<PaginationVo<CollageRecord>> CollageRecordList(CollageRecord collage,
-                                                                       @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                       @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+    public ResponseJson<PaginationVo<CollageRecord>> CollageRecordList(CollageRecord collage, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return productService.CollageRecordList(collage, pageNum, pageSize);
     }
 
@@ -149,9 +130,7 @@ public class HeHeProductApi {
      * @return
      */
     @GetMapping("/sales/products")
-    public ResponseJson<PaginationVo<HeHeActivityProduct>> salesProductList(HeHeActivityProduct product,
-                                                                            @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+    public ResponseJson<PaginationVo<HeHeActivityProduct>> salesProductList(HeHeActivityProduct product, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         if (null == product.getUserId() || 0 == product.getUserId()) {
             return ResponseJson.error("分销者Id不能为空！", null);
         }
@@ -170,18 +149,59 @@ public class HeHeProductApi {
      * @return
      */
     @GetMapping("/sales/activity/products")
-    public ResponseJson<PaginationVo<HeHeProduct>> salesActivityProductList(String name, Integer userId, String shopName,
-                                                                            @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+    public ResponseJson<PaginationVo<HeHeProduct>> salesActivityProductList(String name, Integer userId, String shopName, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         if (null == userId || 0 == userId) {
             return ResponseJson.error("分销者Id不能为空！", null);
         }
         return productService.salesActivityProductList(name, userId, shopName, pageNum, pageSize);
     }
 
-
     /**
+     * 商品管理 - 上线商品编辑页面参数
+     * 商品一级分类
      *
+     * @return
      */
+    @GetMapping("/products/bigType")
+    public ResponseJson<List<HeHeBigType>> findBigType() {
+        return productService.findBigType();
+    }
 
+    /**
+     * 商品管理 - 上线商品编辑页面参数
+     * 商品二级分类
+     * @param bigTypeId
+     * @return
+     */
+    @GetMapping("/products/smallType")
+    public ResponseJson<List<CmSmalltype>> findSmallType(Integer bigTypeId) {
+        return productService.findSmallTypeList(bigTypeId);
+    }
+
+    /**
+     * 商品管理 - 上线商品编辑页面参数
+     * 商品活动
+     * @return
+     */
+    @GetMapping("/products/activity")
+    public ResponseJson<List<HeHeActivity>> findProductActivity() {
+        return productService.findProductActivity();
+    }
+
+    /**
+     * 商品管理 - 上线商品编辑页面参数
+     * 选择商品列表
+     * @param product
+     * @return
+     */
+    @GetMapping("/products/productPage")
+    public ResponseJson<List<HeHeProduct>> choseProductPage(HeHeProduct product) {
+        return productService.choseProductPage(product);
+    }
+
+
+    @PostMapping("/product/save")
+    public ResponseJson saveProduct(HeHeProduct product) {
+        return productService.saveProduct(product);
+    }
 }

src/main/java/com/caimei365/manager/controller/hehe/user/HeHeUserApi.java

@@ -1,8 +1,9 @@
 package com.caimei365.manager.controller.hehe.user;
 
+import com.caimei.utils.StringUtils;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
-import com.caimei365.manager.entity.hehe.product.HeHeBigType;
+import com.caimei365.manager.entity.hehe.product.SalesProductDto;
 import com.caimei365.manager.entity.hehe.user.HeHeUser;
 import com.caimei365.manager.service.hehe.user.HeHeUserService;
 import org.springframework.web.bind.annotation.*;
@@ -56,29 +57,47 @@ public class HeHeUserApi {
      * @return
      */
     @PostMapping("/save/sales")
-    public ResponseJson userList(HeHeUser man) {
+    public ResponseJson saveSales(HeHeUser man) {
+        if (StringUtils.isBlank(man.getName())) {
+            return ResponseJson.error("姓名不能为空！");
+        }
+        if (StringUtils.isBlank(man.getMobile())) {
+            return ResponseJson.error("手机号不能为空！");
+        }
         return userService.saveSales(man);
     }
 
     /**
      * 添加分销者活动商品
-     * @param userId
-     * @param productIds
+     *
+     * @param dto
      * @return
      */
     @PostMapping("/add/sales/products")
-    public ResponseJson addSalesActivityProduct(Integer userId, String productIds) {
-        return userService.addSaleActivityProducts(userId, productIds);
+    public ResponseJson addSalesActivityProduct(SalesProductDto dto) {
+        if (null == dto.getUserId()) {
+            return ResponseJson.error("用户Id不能为空！");
+        }
+        if (StringUtils.isBlank(dto.getProductIds())) {
+            return ResponseJson.error("商品Id不能为空！");
+        }
+        return userService.addSaleActivityProducts(dto.getUserId(), dto.getProductIds());
     }
 
     /**
      * 删除分销者活动商品
-     * @param userId
-     * @param productId
+     *
+     * @param dto
      * @return
      */
     @PostMapping("/del/sales/products")
-    public ResponseJson delSalesActivityProduct(Integer userId, Integer productId) {
-        return userService.delSaleActivityProducts(userId, productId);
+    public ResponseJson delSalesActivityProduct(SalesProductDto dto) {
+        if (null == dto.getUserId()) {
+            return ResponseJson.error("用户Id不能为空！");
+        }
+        if (null == dto.getProductId()) {
+            return ResponseJson.error("商品Id不能为空！");
+        }
+        return userService.delSaleActivityProducts(dto.getUserId(), dto.getProductId());
     }
 }

src/main/java/com/caimei365/manager/dao/hehe/HeHeProductDao.java

@@ -45,4 +45,8 @@ public interface HeHeProductDao {
     void insertUserActivity(HeHeSalesActivityProduct product);
 
     void deleteUserActivity(Integer userId, Integer productId);
+
+    List<CmSmalltype> findSmallTypeList(Integer bigTypeId);
+
+    List<HeHeProduct> findProductPage(HeHeProduct product);
 }

src/main/java/com/caimei365/manager/entity/hehe/product/CmSmalltype.java

@@ -0,0 +1,55 @@
+package com.caimei365.manager.entity.hehe.product;
+
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class CmSmalltype {
+	
+	private static final long serialVersionUID = 1L;
+
+	private String smallTypeId;
+	/**
+	 * 一级分类Id
+	 */
+	private String bigTypeId;
+	/**
+	 *  商城类型：1采美商城，2呵呵商城
+	 */
+	private Integer mallType;
+	private String name;
+	/**
+	 * 小分类编码
+	 */
+	private String smallTypeCode;
+	/**
+	 * www启用标识，0停用，1启用
+	 */
+	private String wwwValidFlag;
+	/**
+	 * 小程序启用标识，0停用，1启用
+	 */
+	private String crmValidFlag;
+	/**
+	 * 排序值
+	 */
+	private Integer sortIndex;
+	/**
+	 * www图标
+	 */
+	private String wwwIcon;
+	/**
+	 * 小程序图标
+	 */
+	private String crmIcon;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private String addTime;
+
+	/**
+	 * 分类类型，0产品，1仪器
+	 */
+	private String typeSort;
+
+}

src/main/java/com/caimei365/manager/entity/hehe/product/HeHeActivity.java

@@ -13,6 +13,7 @@ import java.util.Date;
 @Data
 public class HeHeActivity  {
 
+	private Integer id;
 	/**
 	 * 活动名称
 	 */

src/main/java/com/caimei365/manager/entity/hehe/product/SalesProductDto.java

@@ -0,0 +1,13 @@
+package com.caimei365.manager.entity.hehe.product;
+
+import lombok.Data;
+
+/**
+ * 分销商品接口参数
+ */
+@Data
+public class SalesProductDto {
+    private Integer userId;
+    private String productIds;
+    private Integer productId;
+}

src/main/java/com/caimei365/manager/entity/order/CmReturnedPurchase.java

@@ -15,6 +15,8 @@ import java.util.List;
 public class CmReturnedPurchase {
 
     private static final long serialVersionUID = 1L;
+
+    private Integer id;
     /**
      * 退款退货编号
      */

src/main/java/com/caimei365/manager/service/hehe/product/HeHeProductService.java

@@ -4,6 +4,8 @@ import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.hehe.product.*;
 
+import java.util.List;
+
 public interface HeHeProductService {
     ResponseJson<PaginationVo<HeHeProduct>> productList(HeHeProduct product, int pageNum, int pageSize);
 
@@ -24,4 +26,14 @@ public interface HeHeProductService {
     ResponseJson<PaginationVo<HeHeActivityProduct>> salesProductList(HeHeActivityProduct product, int pageNum, int pageSize);
 
     ResponseJson<PaginationVo<HeHeProduct>> salesActivityProductList(String name, Integer userId, String shopName, int pageNum, int pageSize);
+
+    ResponseJson<List<HeHeBigType>> findBigType();
+
+    ResponseJson<List<CmSmalltype>> findSmallTypeList(Integer bigTypeId);
+
+    ResponseJson<List<HeHeActivity>> findProductActivity();
+
+    ResponseJson<List<HeHeProduct>> choseProductPage(HeHeProduct product);
+
+    ResponseJson saveProduct(HeHeProduct product);
 }

src/main/java/com/caimei365/manager/service/hehe/product/impl/HeHeProductServiceImpl.java

@@ -16,7 +16,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -130,7 +129,7 @@ public class HeHeProductServiceImpl implements HeHeProductService {
             }
         });
         PaginationVo<HeHeActivityProduct> page = new PaginationVo<>(productList);
-        return null;
+        return ResponseJson.success(page);
     }
 
     @Override
@@ -152,6 +151,34 @@ public class HeHeProductServiceImpl implements HeHeProductService {
                 item.setMainImage(AppUtils.getImageURL("product", item.getMainImage(), 0, wwwServer));
             }
         });
+        PaginationVo<HeHeProduct> page = new PaginationVo<>(productList);
+        return ResponseJson.success(page);
+    }
+
+    @Override
+    public ResponseJson<List<HeHeBigType>> findBigType() {
+        return ResponseJson.success(productDao.findBigTypeList(new HeHeBigType()));
+    }
+
+    @Override
+    public ResponseJson<List<CmSmalltype>> findSmallTypeList(Integer bigTypeId) {
+        return ResponseJson.success(productDao.findSmallTypeList(bigTypeId));
+    }
+
+    @Override
+    public ResponseJson<List<HeHeActivity>> findProductActivity() {
+        return ResponseJson.success(productDao.findActivityList(new HeHeActivity()));
+    }
+
+    @Override
+    public ResponseJson<List<HeHeProduct>> choseProductPage(HeHeProduct product) {
+        return ResponseJson.success(productDao.findProductPage(product));
+    }
+
+    @Override
+    public ResponseJson saveProduct(HeHeProduct product) {
+//        product.getProductId()
+//        productDao.
         return null;
     }
 

src/main/resources/mapper/hehe/HeHeProductDao.xml

@@ -428,4 +428,43 @@
           AND delFlag = 0
     </select>
 
+    <select id="findSmallTypeList" resultType="com.caimei365.manager.entity.hehe.product.CmSmalltype">
+        select smallTypeId,
+               bigTypeId,
+               name,
+               smallTypeCode,
+               wwwValidFlag,
+               crmValidFlag,
+               wwwIcon,
+               crmIcon,
+               addTime,
+               sortIndex
+        from smalltype
+        where bigTypeID = #{bigTypeId}
+    </select>
+
+    <select id="findProductPage" resultType="com.caimei365.manager.entity.hehe.product.HeHeProduct">
+        SELECT
+        a.*,s.name AS "shopName"
+        FROM product a
+        left join cm_organize_product_info copi on copi.productId = a.productID
+        left join cm_hehe_product chp on a.productID = chp.productId
+        LEFT JOIN shop s on s.shopID = a.shopID
+        <where>
+            a.splitCode is not null and a.splitCode != '' and  copi.validFlag=2
+            and s.shopID in(SELECT shopID FROM shop  WHERE name ='深圳市采美奥泰贸易有限公司')
+            and a.productID is null
+            <if test="productID != null">
+                AND a.productID = #{productID}
+            </if>
+            <if test="name != null and name != ''">
+                AND a.name LIKE concat('%',#{name},'%')
+            </if>
+            <if test="shopName != null and shopName != ''">
+                AND s.name LIKE concat('%',#{shopName},'%')
+            </if>
+        </where>
+        group by a.productID
+    </select>
+
 </mapper>

src/main/resources/mapper/hehe/HeHeUserDao.xml

@@ -19,13 +19,13 @@
                 now())
     </insert>
 
-    <insert id="insertCmUser">
+    <insert id="insertCmUser" keyProperty="userId" useGeneratedKeys="true">
         INSERT INTO USER (bindMobile, userIdentity,
                           userName, password, name, registerTime,
-                          validFlag, registerUserTypeID)
+                          validFlag, registerUserTypeId)
         VALUES (#{bindMobile}, #{userIdentity},
                 #{userName}, #{password}, #{name}, #{registerTime},
-                #{validFlag}, #{registerUserTypeID})
+                #{validFlag}, #{registerUserTypeId})
     </insert>
 
     <update id="updateCmUser">