Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineMarket.java

@@ -25,6 +25,8 @@ public class ShopProductToMedicineMarket implements Serializable {
      */
     private Date createTime;
 
+    private Integer sort;
+
     @TableLogic
     private Integer delFlag;
 

src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyMarket.java

@@ -25,6 +25,8 @@ public class ShopProductToSociologyMarket implements Serializable {
      */
     private Date createTime;
 
+    private Integer sort;
+
     @TableLogic
     private Integer delFlag;
 

src/main/java/com/peanut/modules/master/controller/ShopProductController.java

@@ -39,6 +39,7 @@ public class ShopProductController {
         if (StringUtils.isNotEmpty(params.get("productName").toString())) {
             wrapper.like(ShopProduct::getProductName, params.get("productName"));
         }
+        wrapper.eq(StringUtils.isNotBlank(params.get("goodsType").toString())&&params.get("goodsType").toString()!="00",ShopProduct::getGoodsType,params.get("goodsType").toString());
         wrapper.orderByAsc(ShopProduct::getSort);
         wrapper.orderByAsc(ShopProduct::getCreateTime);
         Page<ShopProduct> res = shopProductService.page(new Page<>(

src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java

@@ -279,6 +279,7 @@ public class SociologyLabelAndMarketController {
         if (params.containsKey("sociologyMarketId")&&!"".equals(params.get("sociologyMarketId").toString())){
             wrapper.eq(ShopProductToSociologyMarket::getSociologyMarketId,params.get("sociologyMarketId").toString());
         }
+        wrapper.orderByAsc(ShopProductToSociologyMarket::getSort);
         Page<ShopProductToSociologyMarket> page = toMarketService.page(new Page<>(
                 Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper);
         List<ShopProductToSociologyMarket> res = page.getRecords();
@@ -292,6 +293,12 @@ public class SociologyLabelAndMarketController {
         return R.ok().put("result", page);
     }
 
+    @RequestMapping("/editToMarketSort")
+    public R editToMarketSort(@RequestBody Map<String,Integer> map){
+        toMarketService.editToMarketSort(map);
+        return R.ok();
+    }
+
     @RequestMapping(path = "/saveToLabel")
     public R saveToLabel(@RequestBody Map params) {
         if (!StringUtils.isEmpty(params.get("productId").toString())){

src/main/java/com/peanut/modules/master/service/ShopProductToSociologyMarketService.java

@@ -3,5 +3,9 @@ package com.peanut.modules.master.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.modules.common.entity.ShopProductToSociologyMarket;
 
+import java.util.Map;
+
 public interface ShopProductToSociologyMarketService extends IService<ShopProductToSociologyMarket> {
+
+    void editToMarketSort(Map<String,Integer> map);
 }

src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java

@@ -79,6 +79,7 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
         shopProduct.setProductName(courseEntity.getTitle()+"."+courseCatalogue.getTitle()+"(半年)");
         shopProduct.setPrice(courseCatalogue.getHalfFee());
         shopProduct.setGoodsType("05");
+        shopProduct.setProductImages(courseEntity.getImage());
         shopProductDao.insert(shopProduct);
         //添加半年期的商品课程对应关系
         ShopProductCourseEntity shopProductCourseEntity = new ShopProductCourseEntity();
@@ -93,6 +94,7 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
         shopProduct1.setProductName(courseEntity.getTitle()+"."+courseCatalogue.getTitle()+"(一年)");
         shopProduct1.setPrice(courseCatalogue.getFee());
         shopProduct1.setGoodsType("05");
+        shopProduct1.setProductImages(courseEntity.getImage());
         shopProductDao.insert(shopProduct1);
         //添加一年期的商品课程对应关系
         ShopProductCourseEntity shopProductCourseEntity1 = new ShopProductCourseEntity();

src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java

@@ -7,7 +7,16 @@ import com.peanut.modules.master.service.ShopProductToSociologyMarketService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 @Slf4j
 @Service("masterShopProductToSociologyMarketService")
 public class ShopProductToSociologyMarketServiceImpl extends ServiceImpl<ShopProductToSociologyMarketDao, ShopProductToSociologyMarket> implements ShopProductToSociologyMarketService {
+
+    @Override
+    public void editToMarketSort(Map<String, Integer> map) {
+        ShopProductToSociologyMarket info = this.getById(map.get("id"));
+        info.setSort(map.get("sort"));
+        this.updateById(info);
+    }
 }

src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java

@@ -38,6 +38,7 @@ public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProd
         wrapper.selectAll(ShopProduct.class);
         wrapper.leftJoin(ShopProductToSociologyMarket.class,ShopProductToSociologyMarket::getProductId,ShopProduct::getProductId);
         wrapper.eq(ShopProductToSociologyMarket::getSociologyMarketId,param.getId());
+        wrapper.orderByAsc(ShopProductToSociologyMarket::getSort);
         Page<ShopProduct> shopProductPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), ShopProduct.class, wrapper);
         return shopProductPage;
     }