修复代码

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyClass/controller/CitiyClassController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 动态分类
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Api(tags="动态分类")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyClass/entity/CitiyClass.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 动态分类
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Data
@@ -55,4 +55,8 @@ public class CitiyClass implements Serializable {
 	@Excel(name = "分类排序", width = 15)
     @ApiModelProperty(value = "分类排序")
     private java.lang.Integer sort;
+	/**类型*/
+	@Excel(name = "类型", width = 15)
+    @ApiModelProperty(value = "类型")
+    private java.lang.String linkType;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyClass/mapper/CitiyClassMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 动态分类
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface CitiyClassMapper extends BaseMapper<CitiyClass> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyClass/service/ICitiyClassService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 动态分类
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface ICitiyClassService extends IService<CitiyClass> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyClass/service/impl/CitiyClassServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 动态分类
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyClass/vue/CitiyClassList.vue

@@ -131,6 +131,11 @@
             align:"center",
             dataIndex: 'sort'
           },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'linkType'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -167,6 +172,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'分类名称',dictCode:''})
         fieldList.push({type:'int',value:'sort',text:'分类排序',dictCode:''})
+        fieldList.push({type:'string',value:'linkType',text:'类型',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyClass/vue/modules/CitiyClassForm.vue

@@ -13,6 +13,11 @@
               <a-input-number v-model="model.sort" placeholder="请输入分类排序" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="linkType">
+              <a-input v-model="model.linkType" placeholder="请输入类型"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyClass/vue3/CitiyClass.data.ts

@@ -14,6 +14,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'sort'
    },
+   {
+    title: '类型',
+    align:"center",
+    dataIndex: 'linkType'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -30,4 +35,9 @@ export const formSchema: FormSchema[] = [
     field: 'sort',
     component: 'InputNumber',
   },
+  {
+    label: '类型',
+    field: 'linkType',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityCat/controller/CityCatController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 车找人表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Api(tags="车找人表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityCat/entity/CityCat.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 车找人表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Data
@@ -50,13 +50,13 @@ public class CityCat implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
-	/**车头照片*/
-	@Excel(name = "车头照片", width = 15)
-    @ApiModelProperty(value = "车头照片")
+	/**师傅头像*/
+	@Excel(name = "师傅头像", width = 15)
+    @ApiModelProperty(value = "师傅头像")
     private java.lang.String imageTitle;
-	/**标题*/
-	@Excel(name = "标题", width = 15)
-    @ApiModelProperty(value = "标题")
+	/**师傅名称*/
+	@Excel(name = "师傅名称", width = 15)
+    @ApiModelProperty(value = "师傅名称")
     private java.lang.String title;
 	/**起点*/
 	@Excel(name = "起点", width = 15)
@@ -70,17 +70,33 @@ public class CityCat implements Serializable {
 	@Excel(name = "出发时间", width = 15)
     @ApiModelProperty(value = "出发时间")
     private java.lang.String startTime;
-	/**剩余位置*/
-	@Excel(name = "剩余位置", width = 15)
-    @ApiModelProperty(value = "剩余位置")
+	/**车辆座位*/
+	@Excel(name = "车辆座位", width = 15)
+    @ApiModelProperty(value = "车辆座位")
     private java.lang.Integer num;
-	/**联系电话*/
-	@Excel(name = "联系电话", width = 15)
-    @ApiModelProperty(value = "联系电话")
+	/**师傅电话*/
+	@Excel(name = "师傅电话", width = 15)
+    @ApiModelProperty(value = "师傅电话")
     private java.lang.String phone;
 	/**用户*/
 	@Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "用户")
     private java.lang.String userId;
+	/**车辆信息*/
+	@Excel(name = "车辆信息", width = 15)
+    @ApiModelProperty(value = "车辆信息")
+    private java.lang.String titleDetails;
+	/**车牌号*/
+	@Excel(name = "车牌号", width = 15)
+    @ApiModelProperty(value = "车牌号")
+    private java.lang.String catNo;
+	/**车辆照片*/
+	@Excel(name = "车辆照片", width = 15)
+    @ApiModelProperty(value = "车辆照片")
+    private java.lang.String catImage;
+	/**车型*/
+	@Excel(name = "车型", width = 15)
+    @ApiModelProperty(value = "车型")
+    private java.lang.String catType;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityCat/mapper/CityCatMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 车找人表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 public interface CityCatMapper extends BaseMapper<CityCat> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityCat/service/ICityCatService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 车找人表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 public interface ICityCatService extends IService<CityCat> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityCat/service/impl/CityCatServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 车找人表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityCat/vue/CityCatList.vue

@@ -123,13 +123,13 @@
             }
           },
           {
-            title:'车头照片',
+            title:'师傅头像',
             align:"center",
             dataIndex: 'imageTitle',
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'标题',
+            title:'师傅名称',
             align:"center",
             dataIndex: 'title'
           },
@@ -149,12 +149,12 @@
             dataIndex: 'startTime'
           },
           {
-            title:'剩余位置',
+            title:'车辆座位',
             align:"center",
             dataIndex: 'num'
           },
           {
-            title:'联系电话',
+            title:'师傅电话',
             align:"center",
             dataIndex: 'phone'
           },
@@ -163,6 +163,26 @@
             align:"center",
             dataIndex: 'userId_dictText'
           },
+          {
+            title:'车辆信息',
+            align:"center",
+            dataIndex: 'titleDetails'
+          },
+          {
+            title:'车牌号',
+            align:"center",
+            dataIndex: 'catNo'
+          },
+          {
+            title:'车辆照片',
+            align:"center",
+            dataIndex: 'catImage'
+          },
+          {
+            title:'车型',
+            align:"center",
+            dataIndex: 'catType'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -197,14 +217,18 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'Text',value:'imageTitle',text:'车头照片',dictCode:''})
-        fieldList.push({type:'Text',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'Text',value:'imageTitle',text:'师傅头像',dictCode:''})
+        fieldList.push({type:'Text',value:'title',text:'师傅名称',dictCode:''})
         fieldList.push({type:'Text',value:'startAddress',text:'起点',dictCode:''})
         fieldList.push({type:'Text',value:'endAddress',text:'终点',dictCode:''})
         fieldList.push({type:'string',value:'startTime',text:'出发时间',dictCode:''})
-        fieldList.push({type:'int',value:'num',text:'剩余位置',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'车辆座位',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'师傅电话',dictCode:''})
         fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'Text',value:'titleDetails',text:'车辆信息',dictCode:''})
+        fieldList.push({type:'string',value:'catNo',text:'车牌号',dictCode:''})
+        fieldList.push({type:'Text',value:'catImage',text:'车辆照片',dictCode:''})
+        fieldList.push({type:'string',value:'catType',text:'车型',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityCat/vue/modules/CityCatForm.vue

@@ -4,13 +4,13 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="车头照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageTitle">
+            <a-form-model-item label="师傅头像" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageTitle">
               <j-image-upload isMultiple  v-model="model.imageTitle" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
-              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
+            <a-form-model-item label="师傅名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入师傅名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -29,13 +29,13 @@
             </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 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="phone">
-              <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
+            <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">
@@ -43,6 +43,26 @@
               <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="车辆信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="titleDetails">
+              <a-textarea v-model="model.titleDetails" rows="4" placeholder="请输入车辆信息" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="车牌号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="catNo">
+              <a-input v-model="model.catNo" placeholder="请输入车牌号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="车辆照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="catImage">
+              <a-input v-model="model.catImage" placeholder="请输入车辆照片"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="车型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="catType">
+              <a-input v-model="model.catType" placeholder="请输入车型"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityCat/vue3/CityCat.data.ts

@@ -5,13 +5,13 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '车头照片',
+    title: '师傅头像',
     align:"center",
     dataIndex: 'imageTitle',
     customRender:render.renderAvatar,
    },
    {
-    title: '标题',
+    title: '师傅名称',
     align:"center",
     dataIndex: 'title'
    },
@@ -31,12 +31,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'startTime'
    },
    {
-    title: '剩余位置',
+    title: '车辆座位',
     align:"center",
     dataIndex: 'num'
    },
    {
-    title: '联系电话',
+    title: '师傅电话',
     align:"center",
     dataIndex: 'phone'
    },
@@ -45,6 +45,26 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'userId_dictText'
    },
+   {
+    title: '车辆信息',
+    align:"center",
+    dataIndex: 'titleDetails'
+   },
+   {
+    title: '车牌号',
+    align:"center",
+    dataIndex: 'catNo'
+   },
+   {
+    title: '车辆照片',
+    align:"center",
+    dataIndex: 'catImage'
+   },
+   {
+    title: '车型',
+    align:"center",
+    dataIndex: 'catType'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -52,14 +72,14 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '车头照片',
+    label: '师傅头像',
     field: 'imageTitle',
      component: 'JImageUpload',
      componentProps:{
       },
   },
   {
-    label: '标题',
+    label: '师傅名称',
     field: 'title',
     component: 'Input',
   },
@@ -79,12 +99,12 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '剩余位置',
+    label: '车辆座位',
     field: 'num',
     component: 'InputNumber',
   },
   {
-    label: '联系电话',
+    label: '师傅电话',
     field: 'phone',
     component: 'Input',
   },
@@ -96,4 +116,24 @@ export const formSchema: FormSchema[] = [
        dict:"han_hai_member,nick_name,id"
     },
   },
+  {
+    label: '车辆信息',
+    field: 'titleDetails',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
+  {
+    label: '车牌号',
+    field: 'catNo',
+    component: 'Input',
+  },
+  {
+    label: '车辆照片',
+    field: 'catImage',
+    component: 'Input',
+  },
+  {
+    label: '车型',
+    field: 'catType',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/controller/CityOrderController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单管理
  * @Author: jeecg-boot
- * @Date:   2024-11-09
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Api(tags="订单管理")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/entity/CityOrder.java

@@ -4,11 +4,15 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.cityOrderSku.entity.CityOrderSku;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -20,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单管理
  * @Author: jeecg-boot
- * @Date:   2024-11-09
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Data
@@ -47,6 +51,16 @@ public class CityOrder implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
+	/**状态*/
+	@Excel(name = "状态", width = 15, dicCode = "order_state")
+	@Dict(dicCode = "order_state")
+    @ApiModelProperty(value = "状态")
+    private java.lang.Integer state;
+	/**类型*/
+	@Excel(name = "类型", width = 15, dicCode = "pay_type")
+	@Dict(dicCode = "pay_type")
+    @ApiModelProperty(value = "类型")
+    private java.lang.Integer type;
 	/**商品名称*/
 	@Excel(name = "商品名称", width = 15)
     @ApiModelProperty(value = "商品名称")
@@ -67,16 +81,9 @@ public class CityOrder implements Serializable {
 	@Excel(name = "积分", width = 15)
     @ApiModelProperty(value = "积分")
     private java.math.BigDecimal points;
-	/**类型0积分支付1微信支付*/
-	@Excel(name = "类型0积分支付1微信支付", width = 15)
-    @ApiModelProperty(value = "类型0积分支付1微信支付")
-    private java.lang.Integer type;
-	/**状态0待支付1等待发货2待收货3已完成*/
-	@Excel(name = "状态0待支付1等待发货2待收货3已完成", width = 15)
-    @ApiModelProperty(value = "状态0待支付1等待发货2待收货3已完成")
-    private java.lang.Integer state;
 	/**关联用户*/
-	@Excel(name = "关联用户", width = 15)
+	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户")
     private java.lang.String userId;
 	/**姓名*/
@@ -103,4 +110,11 @@ public class CityOrder implements Serializable {
 	@Excel(name = "佣金", width = 15)
     @ApiModelProperty(value = "佣金")
     private java.math.BigDecimal giveMoney;
+	/**配送费*/
+	@Excel(name = "配送费", width = 15)
+    @ApiModelProperty(value = "配送费")
+    private java.math.BigDecimal peiMoney;
+
+    @TableField(exist = false)
+    private List<CityOrderSku> cityOrderSkuList;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/mapper/CityOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单管理
  * @Author: jeecg-boot
- * @Date:   2024-11-09
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface CityOrderMapper extends BaseMapper<CityOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/service/ICityOrderService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 订单管理
  * @Author: jeecg-boot
- * @Date:   2024-11-09
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface ICityOrderService extends IService<CityOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/service/impl/CityOrderServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 订单管理
  * @Author: jeecg-boot
- * @Date:   2024-11-09
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/CityOrderList.vue

@@ -4,6 +4,26 @@
     <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.state" dictCode="order_state"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="类型">
+              <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="pay_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>
@@ -99,6 +119,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import CityOrderModal from './modules/CityOrderModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'CityOrderList',
@@ -121,6 +142,22 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
           {
             title:'商品名称',
             align:"center",
@@ -129,7 +166,8 @@
           {
             title:'商品图片',
             align:"center",
-            dataIndex: 'image'
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'购买数量',
@@ -146,20 +184,10 @@
             align:"center",
             dataIndex: 'points'
           },
-          {
-            title:'类型0积分支付1微信支付',
-            align:"center",
-            dataIndex: 'type'
-          },
-          {
-            title:'状态0待支付1等待发货2待收货3已完成',
-            align:"center",
-            dataIndex: 'state'
-          },
           {
             title:'关联用户',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'姓名',
@@ -191,6 +219,11 @@
             align:"center",
             dataIndex: 'giveMoney'
           },
+          {
+            title:'配送费',
+            align:"center",
+            dataIndex: 'peiMoney'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -225,20 +258,22 @@
       },
       getSuperFieldList(){
         let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'int',value:'state',text:'状态',dictCode:'order_state'})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:'pay_type'})
         fieldList.push({type:'Text',value:'name',text:'商品名称',dictCode:''})
         fieldList.push({type:'Text',value:'image',text:'商品图片',dictCode:''})
         fieldList.push({type:'int',value:'num',text:'购买数量',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'points',text:'积分',dictCode:''})
-        fieldList.push({type:'int',value:'type',text:'类型0积分支付1微信支付',dictCode:''})
-        fieldList.push({type:'int',value:'state',text:'状态0待支付1等待发货2待收货3已完成',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         fieldList.push({type:'string',value:'addressName',text:'姓名',dictCode:''})
         fieldList.push({type:'string',value:'addressPhone',text:'电话',dictCode:''})
         fieldList.push({type:'string',value:'addressCity',text:'地址',dictCode:''})
         fieldList.push({type:'string',value:'addressDetails',text:'地址详情',dictCode:''})
-        fieldList.push({type:'string',value:'shopId',text:'所属商品',dictCode:''})
+        fieldList.push({type:'string',value:'shopId',text:'所属商品',dictCode:"city_shopping,name,id"})
         fieldList.push({type:'BigDecimal',value:'giveMoney',text:'佣金',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'peiMoney',text:'配送费',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderForm.vue

@@ -3,6 +3,16 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择状态" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="pay_type" placeholder="请选择类型" />
+            </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>
@@ -10,7 +20,7 @@
           </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">
@@ -28,19 +38,9 @@
               <a-input-number v-model="model.points" placeholder="请输入积分" style="width: 100%" />
             </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>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="状态0待支付1等待发货2待收货3已完成" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <a-input-number v-model="model.state" placeholder="请输入状态0待支付1等待发货2待收货3已完成" style="width: 100%" />
-            </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>
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -73,6 +73,11 @@
               <a-input-number v-model="model.giveMoney" placeholder="请输入佣金" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="配送费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="peiMoney">
+              <a-input-number v-model="model.peiMoney" placeholder="请输入配送费" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrder.data.ts

@@ -5,6 +5,22 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
+    title: '创建日期',
+    align:"center",
+    sorter: true,
+    dataIndex: 'createTime'
+   },
+   {
+    title: '状态',
+    align:"center",
+    dataIndex: 'state_dictText'
+   },
+   {
+    title: '类型',
+    align:"center",
+    dataIndex: 'type_dictText'
+   },
+   {
     title: '商品名称',
     align:"center",
     dataIndex: 'name'
@@ -12,7 +28,8 @@ export const columns: BasicColumn[] = [
    {
     title: '商品图片',
     align:"center",
-    dataIndex: 'image'
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
    },
    {
     title: '购买数量',
@@ -29,20 +46,10 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'points'
    },
-   {
-    title: '类型0积分支付1微信支付',
-    align:"center",
-    dataIndex: 'type'
-   },
-   {
-    title: '状态0待支付1等待发货2待收货3已完成',
-    align:"center",
-    dataIndex: 'state'
-   },
    {
     title: '关联用户',
     align:"center",
-    dataIndex: 'userId'
+    dataIndex: 'userId_dictText'
    },
    {
     title: '姓名',
@@ -74,12 +81,51 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'giveMoney'
    },
+   {
+    title: '配送费',
+    align:"center",
+    dataIndex: 'peiMoney'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "状态",
+      field: "state",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"order_state"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "类型",
+      field: "type",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"pay_type"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
+  {
+    label: '状态',
+    field: 'state',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"order_state"
+     },
+  },
+  {
+    label: '类型',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"pay_type"
+     },
+  },
   {
     label: '商品名称',
     field: 'name',
@@ -88,7 +134,9 @@ export const formSchema: FormSchema[] = [
   {
     label: '商品图片',
     field: 'image',
-    component: 'Input',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
     label: '购买数量',
@@ -105,20 +153,13 @@ export const formSchema: FormSchema[] = [
     field: 'points',
     component: 'InputNumber',
   },
-  {
-    label: '类型0积分支付1微信支付',
-    field: 'type',
-    component: 'InputNumber',
-  },
-  {
-    label: '状态0待支付1等待发货2待收货3已完成',
-    field: 'state',
-    component: 'InputNumber',
-  },
   {
     label: '关联用户',
     field: 'userId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
   },
   {
     label: '姓名',
@@ -150,4 +191,9 @@ export const formSchema: FormSchema[] = [
     field: 'giveMoney',
     component: 'InputNumber',
   },
+  {
+    label: '配送费',
+    field: 'peiMoney',
+    component: 'InputNumber',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/controller/CityOrderDetailsController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cityOrderDetails.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cityOrderDetails.entity.CityOrderDetails;
+import org.jeecg.modules.cityOrderDetails.service.ICityOrderDetailsService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 订单详情
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+@Api(tags="订单详情")
+@RestController
+@RequestMapping("/cityOrderDetails/cityOrderDetails")
+@Slf4j
+public class CityOrderDetailsController extends JeecgController<CityOrderDetails, ICityOrderDetailsService> {
+	@Autowired
+	private ICityOrderDetailsService cityOrderDetailsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cityOrderDetails
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "订单详情-分页列表查询")
+	@ApiOperation(value="订单详情-分页列表查询", notes="订单详情-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CityOrderDetails>> queryPageList(CityOrderDetails cityOrderDetails,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CityOrderDetails> queryWrapper = QueryGenerator.initQueryWrapper(cityOrderDetails, req.getParameterMap());
+		Page<CityOrderDetails> page = new Page<CityOrderDetails>(pageNo, pageSize);
+		IPage<CityOrderDetails> pageList = cityOrderDetailsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cityOrderDetails
+	 * @return
+	 */
+	@AutoLog(value = "订单详情-添加")
+	@ApiOperation(value="订单详情-添加", notes="订单详情-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CityOrderDetails cityOrderDetails) {
+		cityOrderDetailsService.save(cityOrderDetails);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cityOrderDetails
+	 * @return
+	 */
+	@AutoLog(value = "订单详情-编辑")
+	@ApiOperation(value="订单详情-编辑", notes="订单详情-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CityOrderDetails cityOrderDetails) {
+		cityOrderDetailsService.updateById(cityOrderDetails);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "订单详情-通过id删除")
+	@ApiOperation(value="订单详情-通过id删除", notes="订单详情-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cityOrderDetailsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "订单详情-批量删除")
+	@ApiOperation(value="订单详情-批量删除", notes="订单详情-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cityOrderDetailsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "订单详情-通过id查询")
+	@ApiOperation(value="订单详情-通过id查询", notes="订单详情-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CityOrderDetails> queryById(@RequestParam(name="id",required=true) String id) {
+		CityOrderDetails cityOrderDetails = cityOrderDetailsService.getById(id);
+		if(cityOrderDetails==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cityOrderDetails);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cityOrderDetails
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CityOrderDetails cityOrderDetails) {
+        return super.exportXls(request, cityOrderDetails, CityOrderDetails.class, "订单详情");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CityOrderDetails.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/entity/CityOrderDetails.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.cityOrderDetails.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 订单详情
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+@Data
+@TableName("city_order_details")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="city_order_details对象", description="订单详情")
+public class CityOrderDetails implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属订单*/
+	@Excel(name = "所属订单", width = 15)
+    @ApiModelProperty(value = "所属订单")
+    private java.lang.String orderId;
+	/**关联商品*/
+	@Excel(name = "关联商品", width = 15)
+    @ApiModelProperty(value = "关联商品")
+    private java.lang.String shopId;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private java.lang.String name;
+	/**数量*/
+	@Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private java.lang.Integer num;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.math.BigDecimal price;
+	/**规格*/
+	@Excel(name = "规格", width = 15)
+    @ApiModelProperty(value = "规格")
+    private java.lang.String sku;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/mapper/CityOrderDetailsMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cityOrderDetails.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cityOrderDetails.entity.CityOrderDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 订单详情
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+public interface CityOrderDetailsMapper extends BaseMapper<CityOrderDetails> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/mapper/xml/CityOrderDetailsMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.cityOrderDetails.mapper.CityOrderDetailsMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/service/ICityOrderDetailsService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cityOrderDetails.service;
+
+import org.jeecg.modules.cityOrderDetails.entity.CityOrderDetails;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 订单详情
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+public interface ICityOrderDetailsService extends IService<CityOrderDetails> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/service/impl/CityOrderDetailsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cityOrderDetails.service.impl;
+
+import org.jeecg.modules.cityOrderDetails.entity.CityOrderDetails;
+import org.jeecg.modules.cityOrderDetails.mapper.CityOrderDetailsMapper;
+import org.jeecg.modules.cityOrderDetails.service.ICityOrderDetailsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 订单详情
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+@Service
+public class CityOrderDetailsServiceImpl extends ServiceImpl<CityOrderDetailsMapper, CityOrderDetails> implements ICityOrderDetailsService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/vue/CityOrderDetailsList.vue

@@ -0,0 +1,201 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('订单详情')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <city-order-details-modal ref="modalForm" @ok="modalFormOk"></city-order-details-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CityOrderDetailsModal from './modules/CityOrderDetailsModal'
+
+  export default {
+    name: 'CityOrderDetailsList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CityOrderDetailsModal
+    },
+    data () {
+      return {
+        description: '订单详情管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'所属订单',
+            align:"center",
+            dataIndex: 'orderId'
+          },
+          {
+            title:'关联商品',
+            align:"center",
+            dataIndex: 'shopId'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'规格',
+            align:"center",
+            dataIndex: 'sku'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cityOrderDetails/cityOrderDetails/list",
+          delete: "/cityOrderDetails/cityOrderDetails/delete",
+          deleteBatch: "/cityOrderDetails/cityOrderDetails/deleteBatch",
+          exportXlsUrl: "/cityOrderDetails/cityOrderDetails/exportXls",
+          importExcelUrl: "cityOrderDetails/cityOrderDetails/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'orderId',text:'所属订单',dictCode:''})
+        fieldList.push({type:'string',value:'shopId',text:'关联商品',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/vue/modules/CityOrderDetailsForm.vue

@@ -0,0 +1,129 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="所属订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
+              <a-input v-model="model.orderId" placeholder="请输入所属订单"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <a-input v-model="model.shopId" 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="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="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="sku">
+              <a-input v-model="model.sku" placeholder="请输入规格"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CityOrderDetailsForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/cityOrderDetails/cityOrderDetails/add",
+          edit: "/cityOrderDetails/cityOrderDetails/edit",
+          queryById: "/cityOrderDetails/cityOrderDetails/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/vue/modules/CityOrderDetailsModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <city-order-details-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-order-details-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CityOrderDetailsForm from './CityOrderDetailsForm'
+
+  export default {
+    name: 'CityOrderDetailsModal',
+    components: {
+      CityOrderDetailsForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/vue/modules/CityOrderDetailsModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <city-order-details-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-order-details-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CityOrderDetailsForm from './CityOrderDetailsForm'
+  export default {
+    name: 'CityOrderDetailsModal',
+    components: {
+      CityOrderDetailsForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/vue3/CityOrderDetails.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cityOrderDetails/cityOrderDetails/list',
+  save='/cityOrderDetails/cityOrderDetails/add',
+  edit='/cityOrderDetails/cityOrderDetails/edit',
+  deleteOne = '/cityOrderDetails/cityOrderDetails/delete',
+  deleteBatch = '/cityOrderDetails/cityOrderDetails/deleteBatch',
+  importExcel = '/cityOrderDetails/cityOrderDetails/importExcel',
+  exportXls = '/cityOrderDetails/cityOrderDetails/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/vue3/CityOrderDetails.data.ts

@@ -0,0 +1,73 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '所属订单',
+    align:"center",
+    dataIndex: 'orderId'
+   },
+   {
+    title: '关联商品',
+    align:"center",
+    dataIndex: 'shopId'
+   },
+   {
+    title: '名称',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '数量',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '规格',
+    align:"center",
+    dataIndex: 'sku'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '所属订单',
+    field: 'orderId',
+    component: 'Input',
+  },
+  {
+    label: '关联商品',
+    field: 'shopId',
+    component: 'Input',
+  },
+  {
+    label: '名称',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '数量',
+    field: 'num',
+    component: 'InputNumber',
+  },
+  {
+    label: '价格',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '规格',
+    field: 'sku',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/vue3/CityOrderDetailsList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CityOrderDetailsModal @register="registerModal" @success="handleSuccess"></CityOrderDetailsModal>
+  </div>
+</template>
+
+<script lang="ts" name="cityOrderDetails-cityOrderDetails" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CityOrderDetailsModal from './components/CityOrderDetailsModal.vue'
+  import {columns, searchFormSchema} from './cityOrderDetails.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cityOrderDetails.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '订单详情',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"订单详情",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderDetails/vue3/components/CityOrderDetailsModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../cityOrderDetails.data';
+    import {saveOrUpdate} from '../cityOrderDetails.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/controller/CityOrderSkuController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cityOrderSku.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cityOrderSku.entity.CityOrderSku;
+import org.jeecg.modules.cityOrderSku.service.ICityOrderSkuService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 订单详情表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+@Api(tags="订单详情表")
+@RestController
+@RequestMapping("/cityOrderSku/cityOrderSku")
+@Slf4j
+public class CityOrderSkuController extends JeecgController<CityOrderSku, ICityOrderSkuService> {
+	@Autowired
+	private ICityOrderSkuService cityOrderSkuService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cityOrderSku
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "订单详情表-分页列表查询")
+	@ApiOperation(value="订单详情表-分页列表查询", notes="订单详情表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CityOrderSku>> queryPageList(CityOrderSku cityOrderSku,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CityOrderSku> queryWrapper = QueryGenerator.initQueryWrapper(cityOrderSku, req.getParameterMap());
+		Page<CityOrderSku> page = new Page<CityOrderSku>(pageNo, pageSize);
+		IPage<CityOrderSku> pageList = cityOrderSkuService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cityOrderSku
+	 * @return
+	 */
+	@AutoLog(value = "订单详情表-添加")
+	@ApiOperation(value="订单详情表-添加", notes="订单详情表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CityOrderSku cityOrderSku) {
+		cityOrderSkuService.save(cityOrderSku);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cityOrderSku
+	 * @return
+	 */
+	@AutoLog(value = "订单详情表-编辑")
+	@ApiOperation(value="订单详情表-编辑", notes="订单详情表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CityOrderSku cityOrderSku) {
+		cityOrderSkuService.updateById(cityOrderSku);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "订单详情表-通过id删除")
+	@ApiOperation(value="订单详情表-通过id删除", notes="订单详情表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cityOrderSkuService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "订单详情表-批量删除")
+	@ApiOperation(value="订单详情表-批量删除", notes="订单详情表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cityOrderSkuService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "订单详情表-通过id查询")
+	@ApiOperation(value="订单详情表-通过id查询", notes="订单详情表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CityOrderSku> queryById(@RequestParam(name="id",required=true) String id) {
+		CityOrderSku cityOrderSku = cityOrderSkuService.getById(id);
+		if(cityOrderSku==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cityOrderSku);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cityOrderSku
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CityOrderSku cityOrderSku) {
+        return super.exportXls(request, cityOrderSku, CityOrderSku.class, "订单详情表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CityOrderSku.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/entity/CityOrderSku.java

@@ -0,0 +1,114 @@
+package org.jeecg.modules.cityOrderSku.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 订单详情表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+@Data
+@TableName("city_order_sku")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="city_order_sku对象", description="订单详情表")
+public class CityOrderSku implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**商品名称*/
+	@Excel(name = "商品名称", width = 15)
+    @ApiModelProperty(value = "商品名称")
+    private java.lang.String name;
+	/**商品图片*/
+	@Excel(name = "商品图片", width = 15)
+    @ApiModelProperty(value = "商品图片")
+    private java.lang.String image;
+	/**购买数量*/
+	@Excel(name = "购买数量", width = 15)
+    @ApiModelProperty(value = "购买数量")
+    private java.lang.Integer num;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.math.BigDecimal price;
+	/**积分*/
+	@Excel(name = "积分", width = 15)
+    @ApiModelProperty(value = "积分")
+    private java.math.BigDecimal points;
+	/**类型*/
+	@Excel(name = "类型", width = 15)
+    @ApiModelProperty(value = "类型")
+    private java.lang.Integer type;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private java.lang.Integer state;
+	/**关联用户*/
+	@Excel(name = "关联用户", width = 15)
+    @ApiModelProperty(value = "关联用户")
+    private java.lang.String userId;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private java.lang.String addressName;
+	/**电话*/
+	@Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private java.lang.String addressPhone;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private java.lang.String addressCity;
+	/**地址详情*/
+	@Excel(name = "地址详情", width = 15)
+    @ApiModelProperty(value = "地址详情")
+    private java.lang.String addressDetails;
+	/**所属商品*/
+	@Excel(name = "所属商品", width = 15)
+    @ApiModelProperty(value = "所属商品")
+    private java.lang.String shopId;
+	/**佣金*/
+	@Excel(name = "佣金", width = 15)
+    @ApiModelProperty(value = "佣金")
+    private java.math.BigDecimal giveMoney;
+	/**主订单*/
+	@Excel(name = "主订单", width = 15)
+    @ApiModelProperty(value = "主订单")
+    private java.lang.String orderId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/mapper/CityOrderSkuMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cityOrderSku.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cityOrderSku.entity.CityOrderSku;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 订单详情表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+public interface CityOrderSkuMapper extends BaseMapper<CityOrderSku> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/mapper/xml/CityOrderSkuMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.cityOrderSku.mapper.CityOrderSkuMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/service/ICityOrderSkuService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cityOrderSku.service;
+
+import org.jeecg.modules.cityOrderSku.entity.CityOrderSku;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 订单详情表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+public interface ICityOrderSkuService extends IService<CityOrderSku> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/service/impl/CityOrderSkuServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cityOrderSku.service.impl;
+
+import org.jeecg.modules.cityOrderSku.entity.CityOrderSku;
+import org.jeecg.modules.cityOrderSku.mapper.CityOrderSkuMapper;
+import org.jeecg.modules.cityOrderSku.service.ICityOrderSkuService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 订单详情表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+@Service
+public class CityOrderSkuServiceImpl extends ServiceImpl<CityOrderSkuMapper, CityOrderSku> implements ICityOrderSkuService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/vue/CityOrderSkuList.vue

@@ -0,0 +1,255 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('订单详情表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <city-order-sku-modal ref="modalForm" @ok="modalFormOk"></city-order-sku-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CityOrderSkuModal from './modules/CityOrderSkuModal'
+
+  export default {
+    name: 'CityOrderSkuList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CityOrderSkuModal
+    },
+    data () {
+      return {
+        description: '订单详情表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'商品名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'商品图片',
+            align:"center",
+            dataIndex: 'image'
+          },
+          {
+            title:'购买数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'积分',
+            align:"center",
+            dataIndex: 'points'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'state'
+          },
+          {
+            title:'关联用户',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'addressName'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'addressPhone'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'addressCity'
+          },
+          {
+            title:'地址详情',
+            align:"center",
+            dataIndex: 'addressDetails'
+          },
+          {
+            title:'所属商品',
+            align:"center",
+            dataIndex: 'shopId'
+          },
+          {
+            title:'佣金',
+            align:"center",
+            dataIndex: 'giveMoney'
+          },
+          {
+            title:'主订单',
+            align:"center",
+            dataIndex: 'orderId'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cityOrderSku/cityOrderSku/list",
+          delete: "/cityOrderSku/cityOrderSku/delete",
+          deleteBatch: "/cityOrderSku/cityOrderSku/deleteBatch",
+          exportXlsUrl: "/cityOrderSku/cityOrderSku/exportXls",
+          importExcelUrl: "cityOrderSku/cityOrderSku/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'name',text:'商品名称',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'商品图片',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'购买数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'points',text:'积分',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:''})
+        fieldList.push({type:'int',value:'state',text:'状态',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:''})
+        fieldList.push({type:'string',value:'addressName',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'addressPhone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'addressCity',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'addressDetails',text:'地址详情',dictCode:''})
+        fieldList.push({type:'string',value:'shopId',text:'所属商品',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'giveMoney',text:'佣金',dictCode:''})
+        fieldList.push({type:'string',value:'orderId',text:'主订单',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/vue/modules/CityOrderSkuForm.vue

@@ -0,0 +1,174 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-textarea v-model="model.name" rows="4" placeholder="请输入商品名称" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <a-textarea v-model="model.image" rows="4" placeholder="请输入商品图片" />
+            </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="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="points">
+              <a-input-number v-model="model.points" placeholder="请输入积分" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <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-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-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressName">
+              <a-input v-model="model.addressName" placeholder="请输入姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressPhone">
+              <a-input v-model="model.addressPhone" placeholder="请输入电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressCity">
+              <a-input v-model="model.addressCity" 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="shopId">
+              <a-input v-model="model.shopId" placeholder="请输入所属商品"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="佣金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="giveMoney">
+              <a-input-number v-model="model.giveMoney" placeholder="请输入佣金" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="主订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
+              <a-input v-model="model.orderId" placeholder="请输入主订单"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CityOrderSkuForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/cityOrderSku/cityOrderSku/add",
+          edit: "/cityOrderSku/cityOrderSku/edit",
+          queryById: "/cityOrderSku/cityOrderSku/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/vue/modules/CityOrderSkuModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <city-order-sku-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-order-sku-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CityOrderSkuForm from './CityOrderSkuForm'
+
+  export default {
+    name: 'CityOrderSkuModal',
+    components: {
+      CityOrderSkuForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/vue/modules/CityOrderSkuModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <city-order-sku-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-order-sku-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CityOrderSkuForm from './CityOrderSkuForm'
+  export default {
+    name: 'CityOrderSkuModal',
+    components: {
+      CityOrderSkuForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/vue3/CityOrderSku.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cityOrderSku/cityOrderSku/list',
+  save='/cityOrderSku/cityOrderSku/add',
+  edit='/cityOrderSku/cityOrderSku/edit',
+  deleteOne = '/cityOrderSku/cityOrderSku/delete',
+  deleteBatch = '/cityOrderSku/cityOrderSku/deleteBatch',
+  importExcel = '/cityOrderSku/cityOrderSku/importExcel',
+  exportXls = '/cityOrderSku/cityOrderSku/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/vue3/CityOrderSku.data.ts

@@ -0,0 +1,163 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '商品名称',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '商品图片',
+    align:"center",
+    dataIndex: 'image'
+   },
+   {
+    title: '购买数量',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '积分',
+    align:"center",
+    dataIndex: 'points'
+   },
+   {
+    title: '类型',
+    align:"center",
+    dataIndex: 'type'
+   },
+   {
+    title: '状态',
+    align:"center",
+    dataIndex: 'state'
+   },
+   {
+    title: '关联用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
+   {
+    title: '姓名',
+    align:"center",
+    dataIndex: 'addressName'
+   },
+   {
+    title: '电话',
+    align:"center",
+    dataIndex: 'addressPhone'
+   },
+   {
+    title: '地址',
+    align:"center",
+    dataIndex: 'addressCity'
+   },
+   {
+    title: '地址详情',
+    align:"center",
+    dataIndex: 'addressDetails'
+   },
+   {
+    title: '所属商品',
+    align:"center",
+    dataIndex: 'shopId'
+   },
+   {
+    title: '佣金',
+    align:"center",
+    dataIndex: 'giveMoney'
+   },
+   {
+    title: '主订单',
+    align:"center",
+    dataIndex: 'orderId'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '商品名称',
+    field: 'name',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
+  {
+    label: '商品图片',
+    field: 'image',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
+  {
+    label: '购买数量',
+    field: 'num',
+    component: 'InputNumber',
+  },
+  {
+    label: '价格',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '积分',
+    field: 'points',
+    component: 'InputNumber',
+  },
+  {
+    label: '类型',
+    field: 'type',
+    component: 'InputNumber',
+  },
+  {
+    label: '状态',
+    field: 'state',
+    component: 'InputNumber',
+  },
+  {
+    label: '关联用户',
+    field: 'userId',
+    component: 'Input',
+  },
+  {
+    label: '姓名',
+    field: 'addressName',
+    component: 'Input',
+  },
+  {
+    label: '电话',
+    field: 'addressPhone',
+    component: 'Input',
+  },
+  {
+    label: '地址',
+    field: 'addressCity',
+    component: 'Input',
+  },
+  {
+    label: '地址详情',
+    field: 'addressDetails',
+    component: 'Input',
+  },
+  {
+    label: '所属商品',
+    field: 'shopId',
+    component: 'Input',
+  },
+  {
+    label: '佣金',
+    field: 'giveMoney',
+    component: 'InputNumber',
+  },
+  {
+    label: '主订单',
+    field: 'orderId',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/vue3/CityOrderSkuList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CityOrderSkuModal @register="registerModal" @success="handleSuccess"></CityOrderSkuModal>
+  </div>
+</template>
+
+<script lang="ts" name="cityOrderSku-cityOrderSku" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CityOrderSkuModal from './components/CityOrderSkuModal.vue'
+  import {columns, searchFormSchema} from './cityOrderSku.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cityOrderSku.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '订单详情表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"订单详情表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrderSku/vue3/components/CityOrderSkuModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../cityOrderSku.data';
+    import {saveOrUpdate} from '../cityOrderSku.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/controller/CityPriceController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cityPrice.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cityPrice.entity.CityPrice;
+import org.jeecg.modules.cityPrice.service.ICityPriceService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 多总价格表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+@Api(tags="多总价格表")
+@RestController
+@RequestMapping("/cityPrice/cityPrice")
+@Slf4j
+public class CityPriceController extends JeecgController<CityPrice, ICityPriceService> {
+	@Autowired
+	private ICityPriceService cityPriceService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cityPrice
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "多总价格表-分页列表查询")
+	@ApiOperation(value="多总价格表-分页列表查询", notes="多总价格表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CityPrice>> queryPageList(CityPrice cityPrice,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CityPrice> queryWrapper = QueryGenerator.initQueryWrapper(cityPrice, req.getParameterMap());
+		Page<CityPrice> page = new Page<CityPrice>(pageNo, pageSize);
+		IPage<CityPrice> pageList = cityPriceService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cityPrice
+	 * @return
+	 */
+	@AutoLog(value = "多总价格表-添加")
+	@ApiOperation(value="多总价格表-添加", notes="多总价格表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CityPrice cityPrice) {
+		cityPriceService.save(cityPrice);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cityPrice
+	 * @return
+	 */
+	@AutoLog(value = "多总价格表-编辑")
+	@ApiOperation(value="多总价格表-编辑", notes="多总价格表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CityPrice cityPrice) {
+		cityPriceService.updateById(cityPrice);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "多总价格表-通过id删除")
+	@ApiOperation(value="多总价格表-通过id删除", notes="多总价格表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cityPriceService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "多总价格表-批量删除")
+	@ApiOperation(value="多总价格表-批量删除", notes="多总价格表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cityPriceService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "多总价格表-通过id查询")
+	@ApiOperation(value="多总价格表-通过id查询", notes="多总价格表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CityPrice> queryById(@RequestParam(name="id",required=true) String id) {
+		CityPrice cityPrice = cityPriceService.getById(id);
+		if(cityPrice==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cityPrice);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cityPrice
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CityPrice cityPrice) {
+        return super.exportXls(request, cityPrice, CityPrice.class, "多总价格表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CityPrice.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/entity/CityPrice.java

@@ -0,0 +1,62 @@
+package org.jeecg.modules.cityPrice.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 多总价格表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+@Data
+@TableName("city_price")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="city_price对象", description="多总价格表")
+public class CityPrice implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private java.lang.String name;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.math.BigDecimal price;
+	/**标签*/
+	@Excel(name = "标签", width = 15)
+    @ApiModelProperty(value = "标签")
+    private java.lang.String keyValue;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/mapper/CityPriceMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cityPrice.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cityPrice.entity.CityPrice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 多总价格表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+public interface CityPriceMapper extends BaseMapper<CityPrice> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/mapper/xml/CityPriceMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.cityPrice.mapper.CityPriceMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/service/ICityPriceService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cityPrice.service;
+
+import org.jeecg.modules.cityPrice.entity.CityPrice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 多总价格表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+public interface ICityPriceService extends IService<CityPrice> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/service/impl/CityPriceServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cityPrice.service.impl;
+
+import org.jeecg.modules.cityPrice.entity.CityPrice;
+import org.jeecg.modules.cityPrice.mapper.CityPriceMapper;
+import org.jeecg.modules.cityPrice.service.ICityPriceService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 多总价格表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+@Service
+public class CityPriceServiceImpl extends ServiceImpl<CityPriceMapper, CityPrice> implements ICityPriceService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/vue/CityPriceList.vue

@@ -0,0 +1,183 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('多总价格表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <city-price-modal ref="modalForm" @ok="modalFormOk"></city-price-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CityPriceModal from './modules/CityPriceModal'
+
+  export default {
+    name: 'CityPriceList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CityPriceModal
+    },
+    data () {
+      return {
+        description: '多总价格表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'标签',
+            align:"center",
+            dataIndex: 'keyValue'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cityPrice/cityPrice/list",
+          delete: "/cityPrice/cityPrice/delete",
+          deleteBatch: "/cityPrice/cityPrice/deleteBatch",
+          exportXlsUrl: "/cityPrice/cityPrice/exportXls",
+          importExcelUrl: "cityPrice/cityPrice/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'string',value:'keyValue',text:'标签',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/vue/modules/CityPriceForm.vue

@@ -0,0 +1,114 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <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="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="keyValue">
+              <a-input v-model="model.keyValue" placeholder="请输入标签"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CityPriceForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/cityPrice/cityPrice/add",
+          edit: "/cityPrice/cityPrice/edit",
+          queryById: "/cityPrice/cityPrice/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/vue/modules/CityPriceModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <city-price-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-price-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CityPriceForm from './CityPriceForm'
+
+  export default {
+    name: 'CityPriceModal',
+    components: {
+      CityPriceForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/vue/modules/CityPriceModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <city-price-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-price-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CityPriceForm from './CityPriceForm'
+  export default {
+    name: 'CityPriceModal',
+    components: {
+      CityPriceForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/vue3/CityPrice.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cityPrice/cityPrice/list',
+  save='/cityPrice/cityPrice/add',
+  edit='/cityPrice/cityPrice/edit',
+  deleteOne = '/cityPrice/cityPrice/delete',
+  deleteBatch = '/cityPrice/cityPrice/deleteBatch',
+  importExcel = '/cityPrice/cityPrice/importExcel',
+  exportXls = '/cityPrice/cityPrice/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/vue3/CityPrice.data.ts

@@ -0,0 +1,43 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '名称',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '标签',
+    align:"center",
+    dataIndex: 'keyValue'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '名称',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '价格',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '标签',
+    field: 'keyValue',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/vue3/CityPriceList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CityPriceModal @register="registerModal" @success="handleSuccess"></CityPriceModal>
+  </div>
+</template>
+
+<script lang="ts" name="cityPrice-cityPrice" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CityPriceModal from './components/CityPriceModal.vue'
+  import {columns, searchFormSchema} from './cityPrice.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cityPrice.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '多总价格表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"多总价格表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityPrice/vue3/components/CityPriceModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../cityPrice.data';
+    import {saveOrUpdate} from '../cityPrice.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/entity/CityShopping.java

@@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.cityShop.entity.CityShop;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -108,4 +110,6 @@ public class CityShopping implements Serializable {
 	@Excel(name = "是否展示在主页", width = 15)
     @ApiModelProperty(value = "是否展示在主页")
     private java.lang.String isIndex;
+    @TableField(exist = false)
+    private CityShop shop;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/controller/CitySignLogController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 签到记录
  * @Author: jeecg-boot
- * @Date:   2024-11-25
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Api(tags="签到记录")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/entity/CitySignLog.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 签到记录
  * @Author: jeecg-boot
- * @Date:   2024-11-25
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Data
@@ -39,12 +39,16 @@ public class CitySignLog implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**用户*/
@@ -55,5 +59,5 @@ public class CitySignLog implements Serializable {
 	/**获得积分*/
 	@Excel(name = "获得积分", width = 15)
     @ApiModelProperty(value = "获得积分")
-    private java.math.BigDecimal intger;
+    private java.math.BigDecimal num;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/CitySignLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 签到记录
  * @Author: jeecg-boot
- * @Date:   2024-11-25
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface CitySignLogMapper extends BaseMapper<CitySignLog> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/ICitySignLogService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 签到记录
  * @Author: jeecg-boot
- * @Date:   2024-11-25
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface ICitySignLogService extends IService<CitySignLog> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/impl/CitySignLogServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 签到记录
  * @Author: jeecg-boot
- * @Date:   2024-11-25
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/CitySignLogList.vue

@@ -122,6 +122,15 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
           {
             title:'用户',
             align:"center",
@@ -130,7 +139,7 @@
           {
             title:'获得积分',
             align:"center",
-            dataIndex: 'intger'
+            dataIndex: 'num'
           },
           {
             title: '操作',
@@ -166,8 +175,9 @@
       },
       getSuperFieldList(){
         let fieldList=[];
+        fieldList.push({type:'date',value:'createTime',text:'创建日期'})
         fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
-        fieldList.push({type:'BigDecimal',value:'intger',text:'获得积分',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'num',text:'获得积分',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogForm.vue

@@ -9,8 +9,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="获得积分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="intger">
-              <a-input-number v-model="model.intger" placeholder="请输入获得积分" style="width: 100%" />
+            <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-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.data.ts

@@ -5,6 +5,15 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
+    title: '创建日期',
+    align:"center",
+    sorter: true,
+    dataIndex: 'createTime',
+    customRender:({text}) =>{
+      return !text?"":(text.length>10?text.substr(0,10):text)
+    },
+   },
+   {
     title: '用户',
     align:"center",
     dataIndex: 'userId_dictText'
@@ -12,7 +21,7 @@ export const columns: BasicColumn[] = [
    {
     title: '获得积分',
     align:"center",
-    dataIndex: 'intger'
+    dataIndex: 'num'
    },
 ];
 //查询数据
@@ -30,7 +39,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '获得积分',
-    field: 'intger',
+    field: 'num',
     component: 'InputNumber',
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/controller/CityTrendsController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 动态信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Api(tags="动态信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/entity/CityTrends.java

@@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.cityShop.entity.CityShop;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -20,7 +22,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 动态信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Data
@@ -103,6 +105,14 @@ public class CityTrends implements Serializable {
 	@Excel(name = "浏览量", width = 15)
     @ApiModelProperty(value = "浏览量")
     private java.lang.Integer isBrowse;
+	/**点赞*/
+	@Excel(name = "点赞", width = 15)
+    @ApiModelProperty(value = "点赞")
+    private java.lang.Integer isUpCheck;
+	/**分享*/
+	@Excel(name = "分享", width = 15)
+    @ApiModelProperty(value = "分享")
+    private java.lang.Integer isShare;
 	/**经度*/
 	@Excel(name = "经度", width = 15)
     @ApiModelProperty(value = "经度")
@@ -123,12 +133,29 @@ public class CityTrends implements Serializable {
 	@Excel(name = "多少年", width = 15)
     @ApiModelProperty(value = "多少年")
     private java.lang.Integer yearDate;
-	/**认证方式*/
-	@Excel(name = "认证方式", width = 15)
-    @ApiModelProperty(value = "认证方式")
-    private java.lang.String isContent;
 	/**联系方式*/
 	@Excel(name = "联系方式", width = 15)
     @ApiModelProperty(value = "联系方式")
     private java.lang.String phone;
+	/**认证方式*/
+	@Excel(name = "认证方式", width = 15)
+    @ApiModelProperty(value = "认证方式")
+    private java.lang.String isContent;
+	/**微信二维码*/
+	@Excel(name = "微信二维码", width = 15)
+    @ApiModelProperty(value = "微信二维码")
+    private java.lang.String wxImage;
+	/**关联店铺*/
+	@Excel(name = "关联店铺", width = 15, dictTable = "city_shop", dicText = "shop_name", dicCode = "id")
+	@Dict(dictTable = "city_shop", dicText = "shop_name", dicCode = "id")
+    @ApiModelProperty(value = "关联店铺")
+    private java.lang.String shopId;
+
+    @TableField(exist = false)
+	private CityShop shop;
+
+    /**驳回备注*/
+    @Excel(name = "驳回备注", width = 15)
+    @ApiModelProperty(value = "驳回备注")
+    private java.lang.String errText;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/mapper/CityTrendsMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 动态信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface CityTrendsMapper extends BaseMapper<CityTrends> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/service/ICityTrendsService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 动态信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface ICityTrendsService extends IService<CityTrends> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/service/impl/CityTrendsServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 动态信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue/CityTrendsList.vue

@@ -5,22 +5,15 @@
       <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-search-select-tag placeholder="请选择所属区域" v-model="queryParam.addId" dict="city_addr,name,id"/>
+            <a-form-item label="发布人">
+              <j-search-select-tag placeholder="请选择发布人" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="发布人">
-              <j-search-select-tag placeholder="请选择发布人" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
+            <a-form-item label="置顶">
+              <j-switch placeholder="请选择置顶" v-model="queryParam.isTop"  query></j-switch>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="置顶">
-                <j-switch placeholder="请选择置顶" v-model="queryParam.isTop"  query></j-switch>
-              </a-form-item>
-            </a-col>
-          </template>
           <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>
@@ -155,64 +148,27 @@
             sorter: true,
             dataIndex: 'createTime'
           },
-          {
-            title:'所属区域',
-            align:"center",
-            dataIndex: 'addId_dictText'
-          },
           {
             title:'图片',
             align:"center",
             dataIndex: 'image',
             scopedSlots: {customRender: 'imgSlot'}
           },
-          {
-            title:'发布昵称',
-            align:"center",
-            dataIndex: 'userName'
-          },
           {
             title:'发布人',
             align:"center",
             dataIndex: 'userId_dictText'
           },
-          {
-            title:'发布人头像',
-            align:"center",
-            dataIndex: 'userImage',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
           {
             title:'审核状态',
             align:"center",
             dataIndex: 'isState_dictText'
           },
-          {
-            title:'置顶',
-            align:"center",
-            dataIndex: 'isTop',
-            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isTop'], text) : ''),
-          },
           {
             title:'分类',
             align:"center",
             dataIndex: 'classId_dictText'
           },
-          {
-            title:'帖子内容',
-            align:"center",
-            dataIndex: 'title'
-          },
-          {
-            title:'点赞量',
-            align:"center",
-            dataIndex: 'isUp'
-          },
-          {
-            title:'踩量',
-            align:"center",
-            dataIndex: 'isDown'
-          },
           {
             title:'评论量',
             align:"center",
@@ -224,14 +180,14 @@
             dataIndex: 'isBrowse'
           },
           {
-            title:'经度',
+            title:'点赞',
             align:"center",
-            dataIndex: 'longitude'
+            dataIndex: 'isUpCheck'
           },
           {
-            title:'纬度',
+            title:'分享',
             align:"center",
-            dataIndex: 'latitude'
+            dataIndex: 'isShare'
           },
           {
             title:'详细地址',
@@ -239,24 +195,20 @@
             dataIndex: 'address'
           },
           {
-            title:'性别',
-            align:"center",
-            dataIndex: 'sex'
-          },
-          {
-            title:'多少年',
+            title:'联系方式',
             align:"center",
-            dataIndex: 'yearDate'
+            dataIndex: 'phone'
           },
           {
-            title:'认证方式',
+            title:'微信二维码',
             align:"center",
-            dataIndex: 'isContent'
+            dataIndex: 'wxImage',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'联系方式',
+            title:'关联店铺',
             align:"center",
-            dataIndex: 'phone'
+            dataIndex: 'shopId_dictText'
           },
           {
             title: '操作',
@@ -294,7 +246,6 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
-        fieldList.push({type:'sel_search',value:'addId',text:'所属区域',dictTable:"city_addr", dictText:'name', dictCode:'id'})
         fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
         fieldList.push({type:'string',value:'userName',text:'发布昵称',dictCode:''})
         fieldList.push({type:'sel_search',value:'userId',text:'发布人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
@@ -303,17 +254,16 @@
         fieldList.push({type:'switch',value:'isTop',text:'置顶'})
         fieldList.push({type:'sel_search',value:'classId',text:'分类',dictTable:"citiy_class", dictText:'title', dictCode:'id'})
         fieldList.push({type:'Text',value:'title',text:'帖子内容',dictCode:''})
-        fieldList.push({type:'int',value:'isUp',text:'点赞量',dictCode:''})
-        fieldList.push({type:'int',value:'isDown',text:'踩量',dictCode:''})
         fieldList.push({type:'int',value:'isComment',text:'评论量',dictCode:''})
         fieldList.push({type:'int',value:'isBrowse',text:'浏览量',dictCode:''})
+        fieldList.push({type:'int',value:'isUpCheck',text:'点赞',dictCode:''})
+        fieldList.push({type:'int',value:'isShare',text:'分享',dictCode:''})
         fieldList.push({type:'string',value:'longitude',text:'经度',dictCode:''})
         fieldList.push({type:'string',value:'latitude',text:'纬度',dictCode:''})
         fieldList.push({type:'Text',value:'address',text:'详细地址',dictCode:''})
-        fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
-        fieldList.push({type:'int',value:'yearDate',text:'多少年',dictCode:''})
-        fieldList.push({type:'string',value:'isContent',text:'认证方式',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''})
+        fieldList.push({type:'Text',value:'wxImage',text:'微信二维码',dictCode:''})
+        fieldList.push({type:'sel_search',value:'shopId',text:'关联店铺',dictTable:"city_shop", dictText:'name', dictCode:'id'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue/modules/CityTrendsForm.vue

@@ -3,11 +3,6 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="所属区域" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addId">
-              <j-search-select-tag v-model="model.addId" dict="city_addr,name,id"  />
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
               <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
@@ -49,23 +44,23 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="点赞量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isUp">
-              <a-input-number v-model="model.isUp" placeholder="请输入点赞量" style="width: 100%" />
+            <a-form-model-item label="评论量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isComment">
+              <a-input-number v-model="model.isComment" placeholder="请输入评论量" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="踩量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isDown">
-              <a-input-number v-model="model.isDown" placeholder="请输入踩量" style="width: 100%" />
+            <a-form-model-item label="浏览量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isBrowse">
+              <a-input-number v-model="model.isBrowse" placeholder="请输入浏览量" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="评论量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isComment">
-              <a-input-number v-model="model.isComment" placeholder="请输入评论量" style="width: 100%" />
+            <a-form-model-item label="点赞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isUpCheck">
+              <a-input-number v-model="model.isUpCheck" placeholder="请输入点赞" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="浏览量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isBrowse">
-              <a-input-number v-model="model.isBrowse" placeholder="请输入浏览量" style="width: 100%" />
+            <a-form-model-item label="分享" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isShare">
+              <a-input-number v-model="model.isShare" placeholder="请输入分享" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -84,23 +79,18 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
-              <a-input v-model="model.sex" placeholder="请输入性别"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="多少年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearDate">
-              <a-input-number v-model="model.yearDate" placeholder="请输入多少年" style="width: 100%" />
+            <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="isContent">
-              <a-input v-model="model.isContent" placeholder="请输入认证方式"  ></a-input>
+            <a-form-model-item label="微信二维码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wxImage">
+              <j-image-upload isMultiple  v-model="model.wxImage" ></j-image-upload>
             </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 label="关联店铺" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <j-search-select-tag v-model="model.shopId" dict="city_shop,name,id"  />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue3/CityTrends.data.ts

@@ -10,66 +10,27 @@ export const columns: BasicColumn[] = [
     sorter: true,
     dataIndex: 'createTime'
    },
-   {
-    title: '所属区域',
-    align:"center",
-    dataIndex: 'addId_dictText'
-   },
    {
     title: '图片',
     align:"center",
     dataIndex: 'image',
     customRender:render.renderAvatar,
    },
-   {
-    title: '发布昵称',
-    align:"center",
-    dataIndex: 'userName'
-   },
    {
     title: '发布人',
     align:"center",
     dataIndex: 'userId_dictText'
    },
-   {
-    title: '发布人头像',
-    align:"center",
-    dataIndex: 'userImage',
-    customRender:render.renderAvatar,
-   },
    {
     title: '审核状态',
     align:"center",
     dataIndex: 'isState_dictText'
    },
-   {
-    title: '置顶',
-    align:"center",
-    dataIndex: 'isTop',
-    customRender:({text}) => {
-       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
-     },
-   },
    {
     title: '分类',
     align:"center",
     dataIndex: 'classId_dictText'
    },
-   {
-    title: '帖子内容',
-    align:"center",
-    dataIndex: 'title'
-   },
-   {
-    title: '点赞量',
-    align:"center",
-    dataIndex: 'isUp'
-   },
-   {
-    title: '踩量',
-    align:"center",
-    dataIndex: 'isDown'
-   },
    {
     title: '评论量',
     align:"center",
@@ -81,14 +42,14 @@ export const columns: BasicColumn[] = [
     dataIndex: 'isBrowse'
    },
    {
-    title: '经度',
+    title: '点赞',
     align:"center",
-    dataIndex: 'longitude'
+    dataIndex: 'isUpCheck'
    },
    {
-    title: '纬度',
+    title: '分享',
     align:"center",
-    dataIndex: 'latitude'
+    dataIndex: 'isShare'
    },
    {
     title: '详细地址',
@@ -96,38 +57,25 @@ export const columns: BasicColumn[] = [
     dataIndex: 'address'
    },
    {
-    title: '性别',
-    align:"center",
-    dataIndex: 'sex'
-   },
-   {
-    title: '多少年',
+    title: '联系方式',
     align:"center",
-    dataIndex: 'yearDate'
+    dataIndex: 'phone'
    },
    {
-    title: '认证方式',
+    title: '微信二维码',
     align:"center",
-    dataIndex: 'isContent'
+    dataIndex: 'wxImage',
+    customRender:render.renderAvatar,
    },
    {
-    title: '联系方式',
+    title: '关联店铺',
     align:"center",
-    dataIndex: 'phone'
+    dataIndex: 'shopId_dictText'
    },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
-      label: "所属区域",
-      field: "addId",
-      component: 'JSearchSelect',
-      componentProps:{
-         dict:"city_addr,name,id"
-      },
-      colProps: {span: 6},
- 	},
-	{
       label: "发布人",
       field: "userId",
       component: 'JSearchSelect',
@@ -147,14 +95,6 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
-  {
-    label: '所属区域',
-    field: 'addId',
-    component: 'JSearchSelect',
-    componentProps:{
-       dict:"city_addr,name,id"
-    },
-  },
   {
     label: '图片',
     field: 'image',
@@ -211,23 +151,23 @@ export const formSchema: FormSchema[] = [
     component: 'InputTextArea',//TODO 注意string转换问题
   },
   {
-    label: '点赞量',
-    field: 'isUp',
+    label: '评论量',
+    field: 'isComment',
     component: 'InputNumber',
   },
   {
-    label: '踩量',
-    field: 'isDown',
+    label: '浏览量',
+    field: 'isBrowse',
     component: 'InputNumber',
   },
   {
-    label: '评论量',
-    field: 'isComment',
+    label: '点赞',
+    field: 'isUpCheck',
     component: 'InputNumber',
   },
   {
-    label: '浏览量',
-    field: 'isBrowse',
+    label: '分享',
+    field: 'isShare',
     component: 'InputNumber',
   },
   {
@@ -246,23 +186,23 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '性别',
-    field: 'sex',
+    label: '联系方式',
+    field: 'phone',
     component: 'Input',
   },
   {
-    label: '多少年',
-    field: 'yearDate',
-    component: 'InputNumber',
-  },
-  {
-    label: '认证方式',
-    field: 'isContent',
-    component: 'Input',
+    label: '微信二维码',
+    field: 'wxImage',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
-    label: '联系方式',
-    field: 'phone',
-    component: 'Input',
+    label: '关联店铺',
+    field: 'shopId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"city_shop,name,id"
+    },
   },
 ];

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java

@@ -10,6 +10,7 @@ import org.jeecg.modules.cityCat.entity.CityCat;
 import org.jeecg.modules.cityComment.entity.CityComment;
 import org.jeecg.modules.cityHome.entity.CityHome;
 import org.jeecg.modules.cityJob.entity.CityJob;
+import org.jeecg.modules.cityShopping.entity.CityShopping;
 import org.jeecg.modules.cityTrends.entity.CityTrends;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -213,5 +214,10 @@ public interface YaoDuApiService {
     Result<?> getGoodsList(String token,String shopId,PageBean pageBean);
 
 
+    //我的店铺
+    Result<?> myShop( String token,PageBean pageBean);
+
+    //编辑我的店铺商品
+    Result<?> editShopGoods(String token, CityShopping goods);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java

@@ -12,6 +12,13 @@ public interface YaoDuOrderService {
     //商城-立即购买商品
     Result<?> createOrder(String token,String shopId,Integer num,String addressId);
 
+
+    //商城-立即购买多少商品
+    Result<?> createSumOrder(String token,String list,String addressId);
+
+    //商城-获取所有的价格
+    Result<?> getPrice();
+
     //商城-订单列表
     Result<?> getOrderList(String token,YaoDuOrderBean bean);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java

@@ -302,6 +302,10 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
 
         CityConf notice = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "notice").one();
         map.put("notice",notice);
+
+        CityConf save_no = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "save_no").one();
+        map.put("save_no",save_no);
+
         return Result.OK(map);
     }
 
@@ -370,6 +374,13 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
             }else{
                 cityTrends.setIsContent("");
             }
+
+            //店铺信息
+            CityShop shop = cityShopService.lambdaQuery().eq(CityShop::getId, cityTrends.getShopId()).one();
+            if(shop!=null){
+                cityTrends.setShop(shop);
+            }
+
             newRecords.add(cityTrends);
         }
         //随机排序帖子列表数据，每次刷新展示的数据不同
@@ -413,6 +424,12 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
             cityTrends.setIsContent("");
         }
 
+        //店铺信息
+        CityShop shop = cityShopService.lambdaQuery().eq(CityShop::getId, cityTrends.getShopId()).one();
+        if(shop!=null){
+            cityTrends.setShop(shop);
+        }
+
         return Result.OK(cityTrends);
     }
 
@@ -606,12 +623,12 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
                 cityClick.setUserId(hanHaiMember.getId());
                 cityClick.setType(type);
                 cityClick.setOrderId(id);
-                cityClick.setTitle("点击："+title+"的联系方式");
+                cityClick.setTitle("点击：【"+title+"】的联系方式");
                 cityClickService.save(cityClick);
 
             }else if(list.size() >= 2){
                 //查看积分是否充足
-                if(hanHaiMember.getIntegerPrice().compareTo(new BigDecimal(2))>=0){
+                if(hanHaiMember.getIntegerPrice().compareTo(new BigDecimal(2))==-1){
                     return Result.error("积分不足");
                 }
 
@@ -1391,6 +1408,9 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     @Override
     public Result<?> getShoppingDetail(String id){
         CityShopping cityShopping = cityShoppingService.getById(id);
+        //店铺信息
+        CityShop cityShop = cityShopService.getById(cityShopping.getShopId());
+        cityShopping.setShop(cityShop);
         return Result.OK(cityShopping);
     }
 
@@ -1421,6 +1441,7 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     @Override
     public Result<?> addOrEditAddress(String token, CityAddress address){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        address.setUserId(hanHaiMember.getId());
         cityAddressService.saveOrUpdate(address);
         return Result.OK();
     }
@@ -1474,13 +1495,13 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
             citySignLogService.save(citySignLog);
 
             //增加流水记录
-            CityIntgerWater cityMoneyLog = new CityIntgerWater();
-            cityMoneyLog.setCreateTime(new Date());
-            cityMoneyLog.setIntger(new BigDecimal(2));
-            cityMoneyLog.setType(1);
-            cityMoneyLog.setUserId(hanHaiMember.getId());
-            cityMoneyLog.setTitle("每日签到");
-            cityIntgerWaterService.save(cityMoneyLog);
+            CityIntgerWater cityIntgerWater = new CityIntgerWater();
+            cityIntgerWater.setCreateTime(new Date());
+            cityIntgerWater.setIntger(new BigDecimal(2));
+            cityIntgerWater.setType(1);
+            cityIntgerWater.setUserId(hanHaiMember.getId());
+            cityIntgerWater.setTitle(new Date()+"签到");
+            cityIntgerWaterService.save(cityIntgerWater);
 
 
             //修改用户积分
@@ -1537,9 +1558,39 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
         Page<CityShopping> page1 = cityShoppingService.lambdaQuery()
                 .eq(CityShopping::getShopId, shopId)
                 .eq(CityShopping::getIsOpen, "Y")
+                .eq(CityShopping::getClassName, 0)
                 .orderByDesc(CityShopping::getCreateTime)
                 .page(page);
         return Result.OK(page1);
 
     }
+
+
+
+    //我的店铺
+    @Override
+    public Result<?> myShop( String token,PageBean pageBean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //查询我的所有店铺带分页
+        Page<CityShop> page = new Page<CityShop>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<CityShop> page1 = cityShopService
+                .lambdaQuery()
+                .eq(CityShop::getShopUser, hanHaiMember.getId())
+                .orderByDesc(CityShop::getCreateTime)
+                .page(page);
+        return Result.OK(page1);
+    }
+
+
+    //编辑我的店铺商品
+    @Override
+    public Result<?> editShopGoods(String token, CityShopping goods){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        CityShopping cityShopping = cityShoppingService.getById(goods.getId());
+        if(null==cityShopping){
+            return Result.error("商品不存在");
+        }
+        cityShoppingService.saveOrUpdate(goods);
+        return Result.OK("修改成功");
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.api.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
@@ -17,6 +19,10 @@ import org.jeecg.modules.cityConf.entity.CityConf;
 import org.jeecg.modules.cityConf.service.ICityConfService;
 import org.jeecg.modules.cityOrder.entity.CityOrder;
 import org.jeecg.modules.cityOrder.service.ICityOrderService;
+import org.jeecg.modules.cityOrderSku.entity.CityOrderSku;
+import org.jeecg.modules.cityOrderSku.service.ICityOrderSkuService;
+import org.jeecg.modules.cityPrice.entity.CityPrice;
+import org.jeecg.modules.cityPrice.service.ICityPriceService;
 import org.jeecg.modules.cityShopping.entity.CityShopping;
 import org.jeecg.modules.cityShopping.service.ICityShoppingService;
 import org.jeecg.modules.cityVipLog.entity.CityVipLog;
@@ -29,10 +35,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 @Log4j2
@@ -51,6 +54,11 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
     //订单
     @Resource
     private ICityOrderService cityOrderService;
+    //订单规格
+    @Resource
+    private ICityOrderSkuService cityOrderSkuService;
+    @Resource
+    private ICityPriceService cityPriceService;
     //地址
     @Resource
     private ICityAddressService cityAddressService;
@@ -151,12 +159,15 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
         if(null==cityAddress){
             return Result.error("地址不存在");
         }
+        //创建订单标识
+        String orderId = IdWorker.getIdStr();
         //创建订单
         BigDecimal price = cityShopping.getPrice().multiply(new BigDecimal(num));
         //积分
         BigDecimal points = cityShopping.getPoints().multiply(new BigDecimal(num));
 
         CityOrder cityOrder = new CityOrder();
+        cityOrder.setId(orderId);
         cityOrder.setUserId(hanHaiMember.getId());
         cityOrder.setShopId(shopId);
         cityOrder.setNum(num);
@@ -173,6 +184,30 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
         cityOrder.setCreateTime(new Date());
         cityOrderService.save(cityOrder);
 
+
+
+        CityOrderSku sku = new CityOrderSku();
+        sku.setUserId(hanHaiMember.getId());
+        sku.setShopId(shopId);
+        sku.setNum(num);
+        sku.setAddressCity(cityAddress.getAddress());
+        sku.setAddressName(cityAddress.getName());
+        sku.setAddressPhone(cityAddress.getPhone());
+        sku.setAddressDetails(cityAddress.getAddressDetail());
+        sku.setName(cityShopping.getName());
+        sku.setPrice(price);
+        sku.setPoints(points);
+        sku.setImage(cityShopping.getImage());
+        sku.setState(0);
+        sku.setType(1); //微信支付
+        sku.setCreateTime(new Date());
+        sku.setOrderId(orderId);
+        cityOrderSkuService.save(sku);
+
+
+
+
+
         //吊起微信支付
         String s = price.multiply(new BigDecimal(100)).toString();
         int i1 = Double.valueOf(s).intValue();
@@ -188,6 +223,132 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
         return Result.OK("支付成功",appOrder);
     }
 
+
+
+    //商城-立即购买多少商品
+    @Override
+    public Result<?> createSumOrder(String token,String list,String addressId){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //用户地址不能为空
+        if(StringUtils.isBlank(addressId)){
+            return Result.error("请选择收货地址");
+        }
+        //根据商品标识查询地址是否存在
+        CityAddress cityAddress = cityAddressService.getById(addressId);
+        if(null==cityAddress){
+            return Result.error("地址不存在");
+        }
+        //把list转为对象 list = [{"shopId":"1","num":1},{"shopId":"2","num":2}]
+        List<CityOrderSku> list1 = JSON.parseArray(list, CityOrderSku.class);
+        //创建订单标识
+        String orderId = IdWorker.getIdStr();
+        if(null!=list1 && list1.size()>0){
+            //订单总额
+            BigDecimal totalPrice = new BigDecimal(0);
+            //积分总额
+            BigDecimal totalPoints = new BigDecimal(0);
+            //订单商品数量
+            Integer totalNum = 0;
+
+            //创建订单详情
+            for (CityOrderSku sku : list1) {
+                //根据商品标识查询商品是否存在
+                CityShopping cityShopping = cityShoppingService.getById(sku.getShopId());
+                if(null==cityShopping){
+                    return Result.error("商品不存在");
+                }
+                //创建订单
+                BigDecimal price = cityShopping.getPrice().multiply(new BigDecimal(sku.getNum()));
+
+                sku.setUserId(hanHaiMember.getId());
+                sku.setShopId(sku.getShopId());
+                sku.setNum(sku.getNum());
+                sku.setAddressCity(cityAddress.getAddress());
+                sku.setAddressName(cityAddress.getName());
+                sku.setAddressPhone(cityAddress.getPhone());
+                sku.setAddressDetails(cityAddress.getAddressDetail());
+                sku.setName(cityShopping.getName());
+                sku.setPrice(price);
+
+                sku.setImage(cityShopping.getImage());
+                sku.setState(0);
+                sku.setType(1); //微信支付
+                sku.setCreateTime(new Date());
+                sku.setOrderId(orderId);
+                cityOrderSkuService.save(sku);
+
+                //计算总价格
+                totalPrice = totalPrice.add(price);
+
+                totalNum = totalNum + sku.getNum();
+            }
+
+            //获取配送费用
+            BigDecimal pei_money = cityPriceService.lambdaQuery()
+                    .eq(CityPrice::getKeyValue, "pei_money").one().getPrice();
+
+
+            totalPrice = totalPrice.add(pei_money);
+
+            //创建主订单
+            CityOrder cityOrder = new CityOrder();
+            cityOrder.setId(orderId);
+            cityOrder.setUserId(hanHaiMember.getId());
+            cityOrder.setShopId(null);
+            cityOrder.setNum(totalNum);
+            cityOrder.setAddressCity(cityAddress.getAddress());
+            cityOrder.setAddressName(cityAddress.getName());
+            cityOrder.setAddressPhone(cityAddress.getPhone());
+            cityOrder.setAddressDetails(cityAddress.getAddressDetail());
+            cityOrder.setName("店铺订单");
+            cityOrder.setPrice(totalPrice);
+            cityOrder.setPoints(totalPoints);
+            cityOrder.setImage(null);
+            cityOrder.setState(0);
+            cityOrder.setType(1);
+            cityOrder.setCreateTime(new Date());
+
+
+
+            cityOrder.setPeiMoney(pei_money);
+            cityOrderService.save(cityOrder);
+
+            //吊起微信支付
+            String s = totalPrice.multiply(new BigDecimal(100)).toString();
+            int i1 = Double.valueOf(s).intValue();
+            Object appOrder = mpWxPayService.createOrder(
+                    "购买"+ "店铺订单" ,
+                    "127.0.0.1",
+                    orderId,
+                    i1,
+                    orderId,
+                    hanHaiMember.getAppletOpenid(),
+                    cityOrder.toString());
+
+            return Result.OK("支付成功",appOrder);
+        }
+
+        return null;
+    }
+
+
+
+    //商城-获取所有的价格
+    @Override
+    public Result<?> getPrice(){
+        List<CityPrice> list = cityPriceService.list();
+        return Result.OK(list);
+    }
+
+
+
+
+
+
+
+
+
+
     //商城-订单列表
     @Override
     public Result<?> getOrderList(String token, YaoDuOrderBean bean){
@@ -205,6 +366,19 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
                     .orderByDesc(CityOrder::getCreateTime)
                     .page(page);
         }
+        //拿出订单集合
+        List<CityOrder> records = page1.getRecords();
+        //创建新集合
+        List<CityOrder> newRecords = new ArrayList<>();
+        for (CityOrder cityOrder : records) {
+            //根据订单id查询订单详情
+            List<CityOrderSku> cityOrderSkuList = cityOrderSkuService.lambdaQuery()
+                    .eq(CityOrderSku::getOrderId,cityOrder.getId())
+                    .list();
+            cityOrder.setCityOrderSkuList(cityOrderSkuList);
+            newRecords.add(cityOrder);
+        }
+        page1.setRecords(newRecords);
         return Result.OK(page1);
     }
 
@@ -213,6 +387,9 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
     public Result<?> getOrderDetail(String token,String orderId){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         CityOrder cityOrder = cityOrderService.getById(orderId);
+        cityOrder.setCityOrderSkuList(cityOrderSkuService.lambdaQuery()
+                .eq(CityOrderSku::getOrderId,orderId)
+                .list());
         return Result.OK(cityOrder);
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java

@@ -13,6 +13,7 @@ import org.jeecg.modules.cityCat.entity.CityCat;
 import org.jeecg.modules.cityComment.entity.CityComment;
 import org.jeecg.modules.cityHome.entity.CityHome;
 import org.jeecg.modules.cityJob.entity.CityJob;
+import org.jeecg.modules.cityShopping.entity.CityShopping;
 import org.jeecg.modules.cityTrends.entity.CityTrends;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.web.bind.annotation.*;
@@ -270,5 +271,18 @@ public class YaoDuApiTokenController {
     }
 
 
+    //我的店铺
+    @ApiOperation(value="我的店铺")
+    @GetMapping("/myShop")
+    public Result<?> myShop(@RequestHeader("X-Access-Token") String token,PageBean pageBean){
+        return yaoDuApiService.myShop(token,pageBean);
+    }
+
+    //编辑我的店铺商品
+    @ApiOperation(value="编辑我的店铺商品")
+    @PostMapping("/editShopGoods")
+    public Result<?> editShopGoods(@RequestHeader("X-Access-Token") String token, CityShopping goods){
+        return yaoDuApiService.editShopGoods(token,goods);
+    }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java

@@ -39,6 +39,26 @@ public class YaoDuOrderController {
         return yaoDuOrderService.createOrder(token,shopId,num,addressId);
     }
 
+
+    //商城-立即购买多少商品
+    @ApiOperation(value="商城-立即购买多少商品", notes="商城-立即购买多少商品")
+    @PostMapping("/createSumOrder")
+    public Result<?> createSumOrder(@RequestHeader("X-Access-Token") String token,String list,String addressId){
+        return yaoDuOrderService.createSumOrder(token,list,addressId);
+    }
+
+    //商品-获取各项提示费用
+    @ApiOperation(value="商品-获取各项提示费用", notes="商品-获取各项提示费用")
+    @GetMapping("/getPrice")
+    public Result<?> getPrice(){
+        return yaoDuOrderService.getPrice();
+    }
+
+
+
+
+
+
     //商城-订单列表
     @ApiOperation(value="商城-订单列表", notes="商城-订单列表")
     @GetMapping("/getOrderList")