大米修复

admin-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8000/rice-admin/
+VUE_APP_API_BASE_URL=http://localhost:8001/rice-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8000/rice-admin/
+VUE_APP_API_BASE_URL=http://localhost:8001/rice-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceIndexController.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.api.service.ApiRiceService;
+import org.jeecg.bean.PageBean;
 import org.jeecg.common.api.vo.Result;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -60,6 +61,16 @@ public class ApiRiceIndexController {
         return apiRiceService.getRiceCommonProductList();
     }
 
+
+    //获取分类分页商品列表接口
+    @ApiOperation(value="获取分类分页商品列表接口", notes="获取分类分页商品列表接口")
+    @GetMapping(value = "/getClassShopPageList")
+    public Result<?> getClassShopPageList(PageBean pageBean,String classId) {
+        return apiRiceService.getClassShopPageList(pageBean,classId);
+    }
+
+
+
     //获取首页商品详情
     @ApiOperation(value="获取首页商品详情", notes="获取首页商品详情")
     @GetMapping(value = "/getRiceProductDetail")
@@ -75,19 +86,47 @@ public class ApiRiceIndexController {
     }
 
 
-    //获取首页新闻详情
-    @ApiOperation(value="获取首页新闻详情", notes="获取首页新闻详情")
+    //获取介绍详情
+    @ApiOperation(value="获取介绍详情", notes="获取介绍详情")
     @GetMapping(value = "/getRiceNewsDetail")
     public Result<?> getRiceNewsDetail(String id) {
         return apiRiceService.getRiceNewsDetail(id);
     }
 
 
+
+
+    //获取首页新闻详情
+    @ApiOperation(value="获取首页新闻详情", notes="获取首页新闻详情")
+    @GetMapping(value = "/getCommonNewsDetail")
+    public Result<?> getCommonNewsDetail(String id) {
+        return apiRiceService.getCommonNewsDetail(id);
+    }
+
+
     //创建订单
     @ApiOperation(value="创建订单", notes="创建订单")
     @GetMapping(value = "/createOrder")
-    public Result<?> createOrder() {
-        return Result.OK("创建订单");
+    public Result<?> createOrder(String token,String productId,Integer num) {
+        return apiRiceService.createOrder(token,productId,num);
+    }
+
+
+    //加入购物车 传入token productId num
+    @ApiOperation(value="加入购物车 传入token productId num", notes="加入购物车 传入token productId num")
+    @GetMapping(value = "/addCart")
+    public Result<?> addCart(String token,String productId,Integer num){
+        return apiRiceService.addCart(token,productId,num);
+    }
+
+
+
+
+    //查询分类接口
+    @ApiOperation(value="查询分类接口", notes="查询分类接口")
+    @GetMapping(value = "/getCategoryList")
+    private Result<?> getCategoryList(){
+        return apiRiceService.getCategoryList();
     }
 
 

applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java

@@ -5,7 +5,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.api.service.ApiRiceService;
+import org.jeecg.bean.PageBean;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.commonAddress.entity.CommonAddress;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -60,17 +62,41 @@ public class ApiRiceInfoController {
     //获取购物车信息列表带分页
     @ApiOperation(value="获取购物车信息列表带分页", notes="获取购物车信息列表带分页")
     @GetMapping(value = "/getCartPageList")
-    public Result<?> getCartPageList(){
-        return apiRiceService.getCartPageList();
+    public Result<?> getCartPageList(PageBean pageBean){
+        return apiRiceService.getCartPageList(pageBean);
     }
 
 
     //获取相关介绍
     @ApiOperation(value="获取相关介绍", notes="获取相关介绍")
     @GetMapping(value = "/getInfoIntroduce")
-    public Result<?> getInfoIntroduce(){
-        return apiRiceService.getInfoIntroduce();
+    public Result<?> getInfoIntroduce(String type){
+        return apiRiceService.getInfoIntroduce(type);
     }
 
+    //获取介绍详情的接口
+    @ApiOperation(value="获取介绍详情的接口", notes="获取介绍详情的接口")
+    @GetMapping(value = "/getRiceNewsDetail")
+    public Result<?> getRiceNewsDetail(String id){
+        return apiRiceService.getRiceNewsDetail(id);
+    }
+
+
+   //增加或修改地址信息
+    @ApiOperation(value="增加或修改地址信息", notes="增加或修改地址信息")
+    @GetMapping(value = "/addOrUpdateAddress")
+    public Result<?> addOrUpdateAddress(CommonAddress commonAddress){
+        return apiRiceService.addOrUpdateAddress(commonAddress);
+    }
+
+    //查询个人信息相关
+    @ApiOperation(value="查询个人信息相关", notes="查询个人信息相关")
+    @GetMapping(value = "/getRiceInfo")
+    public Result<?> getRiceInfo(String token){
+        return apiRiceService.getRiceInfo(token);
+    }
+
+
+
 
 }

applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java

@@ -1,7 +1,9 @@
 package org.jeecg.api.service;
 
 import io.swagger.annotations.ApiOperation;
+import org.jeecg.bean.PageBean;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.commonAddress.entity.CommonAddress;
 import org.springframework.web.bind.annotation.GetMapping;
 
 public interface ApiRiceService {
@@ -37,10 +39,20 @@ public interface ApiRiceService {
     Result<?> getRiceNewsDetail(String id);
 
 
+    Result<?> getCommonNewsDetail(String id);
+
+
     //创建订单
     Result<?> createOrder(String token,String productId,Integer num);
 
 
+    //加入购物车
+    Result<?> addCart(String token,String productId,Integer num);
+
+
+    Result<?> getClassShopPageList(PageBean pageBean,String classId);
+
+
     //获取会员权益信息列表
     Result<?> getRiceVipList();
 
@@ -58,7 +70,7 @@ public interface ApiRiceService {
     Result<?> getFansPageList();
 
     //获取购物车信息列表带分页
-    Result<?> getCartPageList();
+    Result<?> getCartPageList(PageBean pageBean);
 
     //获取地址列表带分页
     Result<?> getAddressPageList();
@@ -67,7 +79,16 @@ public interface ApiRiceService {
     Result<?> getInviteCode();
 
     //获取相关介绍
-    Result<?> getInfoIntroduce();
+    Result<?> getInfoIntroduce(String type);
+
+    //查询分类的接口
+    Result<?> getCategoryList();
+
+    //增加或者修改地址
+    Result<?> addOrUpdateAddress(CommonAddress commonAddress);
+
 
+    //查询个人信息相关
+    Result<?> getRiceInfo(String token);
 
 }

applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.api.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.api.service.ApiRiceService;
+import org.jeecg.bean.PageBean;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.commonAddress.entity.CommonAddress;
 import org.jeecg.modules.commonAddress.service.ICommonAddressService;
@@ -10,6 +11,7 @@ import org.jeecg.modules.commonBanner.entity.CommonBanner;
 import org.jeecg.modules.commonBanner.service.ICommonBannerService;
 import org.jeecg.modules.commonCat.entity.CommonCat;
 import org.jeecg.modules.commonCat.service.ICommonCatService;
+import org.jeecg.modules.commonClass.entity.CommonClass;
 import org.jeecg.modules.commonClass.service.ICommonClassService;
 import org.jeecg.modules.commonConfig.service.ICommonConfigService;
 import org.jeecg.modules.commonIconImage.entity.CommonIconImage;
@@ -35,7 +37,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class ApiRiceServiceImpl implements ApiRiceService {
@@ -76,6 +81,7 @@ public class ApiRiceServiceImpl implements ApiRiceService {
 
 
 
+
     //获取首页轮播图
     @Override
     public Result<?> getRiceBanner() {
@@ -122,6 +128,27 @@ public class ApiRiceServiceImpl implements ApiRiceService {
         return Result.OK(list);
     }
 
+
+    @Override
+    public Result<?> getClassShopPageList(PageBean pageBean,String classId){
+        Page<CommonShop> page = new Page<CommonShop>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<CommonShop> page1 = commonShopService.page(page);
+        //如果分类标识不为空
+        if(classId!=null){
+            IPage<CommonShop> pageList =
+                    commonShopService.lambdaQuery()
+                            .eq(CommonShop::getClassId,classId)
+                            .orderByDesc(CommonShop::getCreateTime)
+                            .page(page);
+            return Result.OK(pageList);
+        }
+        return Result.OK(page1);
+    }
+
+
+
+
+
     //获取首页商品详情
     @Override
     public Result<?> getRiceProductDetail(String id){
@@ -144,6 +171,13 @@ public class ApiRiceServiceImpl implements ApiRiceService {
     //获取首页新闻详情
     @Override
     public Result<?> getRiceNewsDetail(String id) {
+        RiceNews byId = riceNewsService.getById(id);
+        return Result.OK(byId);
+    }
+
+    //获取首页新闻详情
+    @Override
+    public Result<?> getCommonNewsDetail(String id) {
         CommonNews byId = commonNewsService.getById(id);
         return Result.OK(byId);
     }
@@ -152,14 +186,59 @@ public class ApiRiceServiceImpl implements ApiRiceService {
     //创建订单
     @Override
     public Result<?> createOrder(String token,String productId,Integer num) {
+        CommonShop commonShop = commonShopService.getById(productId);
+        if (commonShop==null){
+            return Result.error("商品不存在");
+        }
         CommonOrder commonOrder = new CommonOrder();
-        commonOrder.setTitle("测试生成");
+        commonOrder.setTitle(commonShop.getTitle());
+        commonOrder.setImage(commonShop.getImage());
+        commonOrder.setCreateTime(new Date());
+        commonOrder.setState("0");
 
         commonOrderService.save(commonOrder);
+
+
+        //生成流水数据
+        CommonMoneyLog commonMoneyLog = new CommonMoneyLog();
+        commonMoneyLog.setCreateTime(new Date());
+        commonMoneyLog.setTitle("测试收入");
+        commonMoneyLog.setMoney(commonShop.getPrice());
+        commonMoneyLog.setType(1);
+        commonMoneyLogService.save(commonMoneyLog);
+
+
+        CommonMoneyLog commonMoneyLog2 = new CommonMoneyLog();
+        commonMoneyLog2.setCreateTime(new Date());
+        commonMoneyLog2.setTitle("测试支出");
+        commonMoneyLog2.setMoney(commonShop.getPrice());
+        commonMoneyLog2.setType(0);
+        commonMoneyLogService.save(commonMoneyLog);
+
+
+
+
         return Result.OK("创建成功");
     }
 
 
+    //加入购物车
+    @Override
+    public Result<?> addCart(String token,String productId,Integer num){
+        //根据商品标识查询商品信息
+        CommonShop commonShop = commonShopService.getById(productId);
+        if (commonShop==null){
+            return Result.error("商品不存在");
+        }
+
+        CommonCat commonCat = new CommonCat();
+        commonCat.setTitle(commonShop.getTitle());
+        commonCat.setImage(commonShop.getImage());
+        commonCat.setNum(num);
+        commonCat.setCreateTime(new Date());
+        commonCatService.save(commonCat);
+        return Result.OK("加入成功");
+    }
 
     //获取会员权益信息列表
     @Override
@@ -198,9 +277,9 @@ public class ApiRiceServiceImpl implements ApiRiceService {
 
     //获取购物车信息列表带分页
     @Override
-    public Result<?> getCartPageList(){
-        List<CommonCat> list = commonCatService.list();
-        return Result.OK(list);
+    public Result<?> getCartPageList(PageBean pageBean){
+        Page<CommonCat> page = commonCatService.page(new Page<>(1, 10));
+        return Result.OK(page);
     }
 
     //获取地址列表带分页
@@ -218,8 +297,43 @@ public class ApiRiceServiceImpl implements ApiRiceService {
 
     //获取相关介绍
     @Override
-    public Result<?> getInfoIntroduce(){
-        List<RiceNews> list = riceNewsService.list();
+    public Result<?> getInfoIntroduce(String type){
+        Page<RiceNews> page = riceNewsService
+                .lambdaQuery()
+                .eq(RiceNews::getType,type)
+                .page(new Page<>(1, 10));
+        return Result.OK(page);
+    }
+
+
+    //查询分类接口
+    @Override
+    public Result<?> getCategoryList(){
+        List<CommonClass> list = commonClassService.list();
         return Result.OK(list);
     }
+
+
+    //增加或者修改地址
+    @Override
+    public Result<?> addOrUpdateAddress(CommonAddress commonAddress){
+        commonAddressService.saveOrUpdate(commonAddress);
+        return Result.OK("增加成功");
+    }
+
+
+    //查询个人信息相关
+    @Override
+    public Result<?> getRiceInfo(String token){
+        Map map = new HashMap();
+        //余额、可提现、收益明细
+        map.put("balance",10);
+        map.put("canWithdraw",20);
+        map.put("income",30);
+        //黄金会员
+        map.put("goldenMember",0);
+        //当前会员人数
+        map.put("memberNum",10);
+        return Result.OK(map);
+    }
 }

applet-rice-api/src/main/java/org/jeecg/bean/PageBean.java

@@ -0,0 +1,20 @@
+package org.jeecg.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PageBean {
+
+    /**显示条数*/
+    @ApiModelProperty(value = "显示条数" )
+    private Integer pageSize;
+    /**当前页*/
+    @ApiModelProperty(value = "当前页" )
+    private Integer pageNo;
+
+    public PageBean() {
+        this.pageNo = 1;
+        this.pageSize = 1000;
+    }
+}

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/controller/RiceNewsController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 介绍
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Api(tags="介绍")

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/entity/RiceNews.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 介绍
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Data
@@ -56,11 +56,16 @@ public class RiceNews implements Serializable {
     @ApiModelProperty(value = "图")
     private java.lang.String image;
 	/**类型*/
-	@Excel(name = "类型", width = 15)
+	@Excel(name = "类型", width = 15, dicCode = "rice_news_type")
+	@Dict(dicCode = "rice_news_type")
     @ApiModelProperty(value = "类型")
     private java.lang.String type;
 	/**详情*/
 	@Excel(name = "详情", width = 15)
     @ApiModelProperty(value = "详情")
     private java.lang.String details;
+	/**文本介绍*/
+	@Excel(name = "文本介绍", width = 15)
+    @ApiModelProperty(value = "文本介绍")
+    private java.lang.String titleSub;
 }

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/mapper/RiceNewsMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 介绍
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 public interface RiceNewsMapper extends BaseMapper<RiceNews> {

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/IRiceNewsService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 介绍
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 public interface IRiceNewsService extends IService<RiceNews> {

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/impl/RiceNewsServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 介绍
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Service

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/RiceNewsList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import RiceNewsModal from './modules/RiceNewsModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'RiceNewsList',
@@ -129,17 +130,18 @@
           {
             title:'图',
             align:"center",
-            dataIndex: 'image'
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'类型',
             align:"center",
-            dataIndex: 'type'
+            dataIndex: 'type_dictText'
           },
           {
-            title:'详情',
+            title:'文本介绍',
             align:"center",
-            dataIndex: 'details'
+            dataIndex: 'titleSub'
           },
           {
             title: '操作',
@@ -177,8 +179,9 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
         fieldList.push({type:'Text',value:'image',text:'图',dictCode:''})
-        fieldList.push({type:'string',value:'type',text:'类型',dictCode:''})
+        fieldList.push({type:'string',value:'type',text:'类型',dictCode:'rice_news_type'})
         fieldList.push({type:'Text',value:'details',text:'详情',dictCode:''})
+        fieldList.push({type:'string',value:'titleSub',text:'文本介绍',dictCode:''})
         this.superFieldList = fieldList
       }
     }

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/modules/RiceNewsForm.vue

@@ -10,17 +10,22 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <a-input v-model="model.image" placeholder="请输入图"  ></a-input>
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <a-input v-model="model.type" placeholder="请输入类型"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="rice_news_type" placeholder="请选择类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="details">
-              <a-input v-model="model.details" placeholder="请输入详情"  ></a-input>
+              <j-editor v-model="model.details" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="文本介绍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="titleSub">
+              <a-textarea v-model="model.titleSub" rows="4" placeholder="请输入文本介绍" />
             </a-form-model-item>
           </a-col>
         </a-row>

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue3/RiceNews.data.ts

@@ -12,17 +12,18 @@ export const columns: BasicColumn[] = [
    {
     title: '图',
     align:"center",
-    dataIndex: 'image'
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
    },
    {
     title: '类型',
     align:"center",
-    dataIndex: 'type'
+    dataIndex: 'type_dictText'
    },
    {
-    title: '详情',
+    title: '文本介绍',
     align:"center",
-    dataIndex: 'details'
+    dataIndex: 'titleSub'
    },
 ];
 //查询数据
@@ -38,16 +39,26 @@ export const formSchema: FormSchema[] = [
   {
     label: '图',
     field: 'image',
-    component: 'Input',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
     label: '类型',
     field: 'type',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"rice_news_type"
+     },
   },
   {
     label: '详情',
     field: 'details',
-    component: 'Input',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '文本介绍',
+    field: 'titleSub',
+    component: 'InputTextArea',//TODO 注意string转换问题
   },
 ];

module-common/src/main/java/org/jeecg/modules/commonCat/controller/CommonCatController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 购物车信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Api(tags="购物车信息表")

module-common/src/main/java/org/jeecg/modules/commonCat/entity/CommonCat.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 购物车信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Data
@@ -67,4 +67,8 @@ public class CommonCat implements Serializable {
 	@Excel(name = "用户", width = 15)
     @ApiModelProperty(value = "用户")
     private java.lang.String userId;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.math.BigDecimal price;
 }

module-common/src/main/java/org/jeecg/modules/commonCat/mapper/CommonCatMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 购物车信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 public interface CommonCatMapper extends BaseMapper<CommonCat> {

module-common/src/main/java/org/jeecg/modules/commonCat/service/ICommonCatService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 购物车信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 public interface ICommonCatService extends IService<CommonCat> {

module-common/src/main/java/org/jeecg/modules/commonCat/service/impl/CommonCatServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 购物车信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonCat/vue/CommonCatList.vue

@@ -146,6 +146,11 @@
             align:"center",
             dataIndex: 'userId'
           },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -181,10 +186,11 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
-        fieldList.push({type:'string',value:'image',text:'图片',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
         fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
         fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
         fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatForm.vue

@@ -28,6 +28,11 @@
               <a-input v-model="model.userId" placeholder="请输入用户"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.data.ts

@@ -29,6 +29,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'userId'
    },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'price'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -60,4 +65,9 @@ export const formSchema: FormSchema[] = [
     field: 'userId',
     component: 'Input',
   },
+  {
+    label: '价格',
+    field: 'price',
+    component: 'InputNumber',
+  },
 ];

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-05
  * @Version: V1.0
  */
 @Api(tags="流水日志表")

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-05
  * @Version: V1.0
  */
 @Data
@@ -66,4 +66,8 @@ public class CommonMoneyLog implements Serializable {
 	@Excel(name = "类型", width = 15)
     @ApiModelProperty(value = "类型")
     private java.lang.Integer type;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private java.lang.Integer state;
 }

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-05
  * @Version: V1.0
  */
 public interface CommonMoneyLogMapper extends BaseMapper<CommonMoneyLog> {

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-05
  * @Version: V1.0
  */
 public interface ICommonMoneyLogService extends IService<CommonMoneyLog> {

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-05
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue

@@ -141,6 +141,11 @@
             align:"center",
             dataIndex: 'type'
           },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'state'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -179,6 +184,7 @@
         fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'oldMoney',text:'原金额',dictCode:''})
         fieldList.push({type:'int',value:'type',text:'类型',dictCode:''})
+        fieldList.push({type:'int',value:'state',text:'状态',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue

@@ -23,6 +23,11 @@
               <a-input-number v-model="model.type" placeholder="请输入类型" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <a-input-number v-model="model.state" placeholder="请输入状态" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts

@@ -24,6 +24,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'type'
    },
+   {
+    title: '状态',
+    align:"center",
+    dataIndex: 'state'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -50,4 +55,9 @@ export const formSchema: FormSchema[] = [
     field: 'type',
     component: 'InputNumber',
   },
+  {
+    label: '状态',
+    field: 'state',
+    component: 'InputNumber',
+  },
 ];

module-common/src/main/java/org/jeecg/modules/commonNews/controller/CommonNewsController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 新闻动态表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Api(tags="新闻动态表")

module-common/src/main/java/org/jeecg/modules/commonNews/entity/CommonNews.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 新闻动态表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Data
@@ -59,4 +59,8 @@ public class CommonNews implements Serializable {
 	@Excel(name = "星闻内容", width = 15)
     @ApiModelProperty(value = "星闻内容")
     private java.lang.String details;
+	/**文章描述*/
+	@Excel(name = "文章描述", width = 15)
+    @ApiModelProperty(value = "文章描述")
+    private java.lang.String descValue;
 }

module-common/src/main/java/org/jeecg/modules/commonNews/mapper/CommonNewsMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 新闻动态表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 public interface CommonNewsMapper extends BaseMapper<CommonNews> {

module-common/src/main/java/org/jeecg/modules/commonNews/service/ICommonNewsService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 新闻动态表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 public interface ICommonNewsService extends IService<CommonNews> {

module-common/src/main/java/org/jeecg/modules/commonNews/service/impl/CommonNewsServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 新闻动态表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonNews/vue/CommonNewsList.vue

@@ -144,6 +144,11 @@
             dataIndex: 'details',
             scopedSlots: {customRender: 'htmlSlot'}
           },
+          {
+            title:'文章描述',
+            align:"center",
+            dataIndex: 'descValue'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -182,6 +187,7 @@
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
         fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
         fieldList.push({type:'Text',value:'details',text:'星闻内容',dictCode:''})
+        fieldList.push({type:'string',value:'descValue',text:'文章描述',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonNews/vue/modules/CommonNewsForm.vue

@@ -18,6 +18,11 @@
               <j-editor v-model="model.details" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="文章描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descValue">
+              <a-textarea v-model="model.descValue" rows="4" placeholder="请输入文章描述" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/commonNews/vue3/CommonNews.data.ts

@@ -27,6 +27,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'details',
     slots: { customRender: 'htmlSlot' },
    },
+   {
+    title: '文章描述',
+    align:"center",
+    dataIndex: 'descValue'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -50,4 +55,9 @@ export const formSchema: FormSchema[] = [
     field: 'details',
     component: 'JCodeEditor', //TODO String后缀暂未添加
   },
+  {
+    label: '文章描述',
+    field: 'descValue',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
 ];

module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-05
  * @Version: V1.0
  */
 @Api(tags="订单信息表")

module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-05
  * @Version: V1.0
  */
 @Data
@@ -59,4 +59,36 @@ public class CommonOrder implements Serializable {
 	@Excel(name = "支付状态", width = 15)
     @ApiModelProperty(value = "支付状态")
     private java.lang.String state;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.math.BigDecimal price;
+	/**数量*/
+	@Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private java.lang.Integer num;
+	/**规格*/
+	@Excel(name = "规格", width = 15)
+    @ApiModelProperty(value = "规格")
+    private java.lang.String sku;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private java.lang.String name;
+	/**电话*/
+	@Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private java.lang.String phone;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private java.lang.String address;
+	/**详细地址*/
+	@Excel(name = "详细地址", width = 15)
+    @ApiModelProperty(value = "详细地址")
+    private java.lang.String addressDetails;
+	/**用户*/
+	@Excel(name = "用户", width = 15)
+    @ApiModelProperty(value = "用户")
+    private java.lang.String userId;
 }

module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-05
  * @Version: V1.0
  */
 public interface CommonOrderMapper extends BaseMapper<CommonOrder> {

module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-05
  * @Version: V1.0
  */
 public interface ICommonOrderService extends IService<CommonOrder> {

module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-05
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue

@@ -136,6 +136,46 @@
             align:"center",
             dataIndex: 'state'
           },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'规格',
+            align:"center",
+            dataIndex: 'sku'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'详细地址',
+            align:"center",
+            dataIndex: 'addressDetails'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -171,8 +211,16 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
-        fieldList.push({type:'string',value:'image',text:'图片',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
         fieldList.push({type:'string',value:'state',text:'支付状态',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
+        fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'addressDetails',text:'详细地址',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue

@@ -18,6 +18,46 @@
               <a-input v-model="model.state" placeholder="请输入支付状态"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input-number v-model="model.num" placeholder="请输入数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sku">
+              <a-input v-model="model.sku" placeholder="请输入规格"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详细地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressDetails">
+              <a-input v-model="model.addressDetails" placeholder="请输入详细地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts

@@ -19,6 +19,46 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'state'
    },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '数量',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '规格',
+    align:"center",
+    dataIndex: 'sku'
+   },
+   {
+    title: '姓名',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '地址',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '详细地址',
+    align:"center",
+    dataIndex: 'addressDetails'
+   },
+   {
+    title: '用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -40,4 +80,44 @@ export const formSchema: FormSchema[] = [
     field: 'state',
     component: 'Input',
   },
+  {
+    label: '价格',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '数量',
+    field: 'num',
+    component: 'InputNumber',
+  },
+  {
+    label: '规格',
+    field: 'sku',
+    component: 'Input',
+  },
+  {
+    label: '姓名',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '地址',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '详细地址',
+    field: 'addressDetails',
+    component: 'Input',
+  },
+  {
+    label: '用户',
+    field: 'userId',
+    component: 'Input',
+  },
 ];

module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 单商户商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Api(tags="单商户商品信息表")

module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 单商户商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Data
@@ -59,9 +59,10 @@ public class CommonShop implements Serializable {
 	@Excel(name = "规格", width = 15)
     @ApiModelProperty(value = "规格")
     private java.lang.String sku;
-	/**类型0体验1常规*/
-	@Excel(name = "类型0体验1常规", width = 15)
-    @ApiModelProperty(value = "类型0体验1常规")
+	/**类型*/
+	@Excel(name = "类型", width = 15, dicCode = "shop_type")
+	@Dict(dicCode = "shop_type")
+    @ApiModelProperty(value = "类型")
     private java.lang.Integer type;
 	/**价格*/
 	@Excel(name = "价格", width = 15)
@@ -84,8 +85,8 @@ public class CommonShop implements Serializable {
     @ApiModelProperty(value = "详情")
     private java.lang.String details;
 	/**分类标识*/
-	@Excel(name = "分类标识", width = 15, dictTable = "common_class", dicText = "", dicCode = "title")
-	@Dict(dictTable = "common_class", dicText = "", dicCode = "title")
+	@Excel(name = "分类标识", width = 15, dictTable = "common_class", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "common_class", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "分类标识")
     private java.lang.String classId;
 }

module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 单商户商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 public interface CommonShopMapper extends BaseMapper<CommonShop> {

module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 单商户商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 public interface ICommonShopService extends IService<CommonShop> {

module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 单商户商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-04
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue

@@ -4,6 +4,21 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="类型">
+              <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="shop_type"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -139,9 +154,9 @@
             dataIndex: 'sku'
           },
           {
-            title:'类型0体验1常规',
+            title:'类型',
             align:"center",
-            dataIndex: 'type'
+            dataIndex: 'type_dictText'
           },
           {
             title:'价格',
@@ -205,13 +220,13 @@
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
         fieldList.push({type:'Text',value:'image',text:'主图',dictCode:''})
         fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
-        fieldList.push({type:'int',value:'type',text:'类型0体验1常规',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:'shop_type'})
         fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'oldPrice',text:'原价',dictCode:''})
         fieldList.push({type:'int',value:'num',text:'限购数量',dictCode:''})
         fieldList.push({type:'string',value:'skuIcon',text:'标签',dictCode:''})
         fieldList.push({type:'Text',value:'details',text:'详情',dictCode:''})
-        fieldList.push({type:'sel_search',value:'classId',text:'分类标识',dictTable:"common_class", dictText:'', dictCode:'title'})
+        fieldList.push({type:'sel_search',value:'classId',text:'分类标识',dictTable:"common_class", dictText:'title', dictCode:'id'})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.vue

@@ -19,8 +19,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="类型0体验1常规" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <a-input-number v-model="model.type" placeholder="请输入类型0体验1常规" style="width: 100%" />
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="shop_type" placeholder="请选择类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -50,7 +50,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="分类标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="classId">
-              <j-search-select-tag v-model="model.classId" dict="title"  />
+              <j-search-select-tag v-model="model.classId" dict="common_class,title,id"  />
             </a-form-model-item>
           </a-col>
         </a-row>

module-common/src/main/java/org/jeecg/modules/commonShop/vue3/CommonShop.data.ts

@@ -21,9 +21,9 @@ export const columns: BasicColumn[] = [
     dataIndex: 'sku'
    },
    {
-    title: '类型0体验1常规',
+    title: '类型',
     align:"center",
-    dataIndex: 'type'
+    dataIndex: 'type_dictText'
    },
    {
     title: '价格',
@@ -53,6 +53,15 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "类型",
+      field: "type",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"shop_type"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -74,9 +83,12 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '类型0体验1常规',
+    label: '类型',
     field: 'type',
-    component: 'InputNumber',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"shop_type"
+     },
   },
   {
     label: '价格',
@@ -108,7 +120,7 @@ export const formSchema: FormSchema[] = [
     field: 'classId',
     component: 'JSearchSelect',
     componentProps:{
-       dict:"title"
+       dict:"common_class,title,id"
     },
   },
 ];

module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8000
+  port: 8001
   tomcat:
     max-swallow-size: -1
   error: