修复

module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java

@@ -75,13 +75,13 @@ public class AppletClassServiceImpl implements AppletClassService {
         Page<CommonVip> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
         IPage<CommonVip> pageList = commonVipService
                 .lambdaQuery()
-                .eq(CommonVip::getPid, iconId)
+//                .eq(CommonVip::getPid, iconId)
                 .page(page);
         //如果名称不为空
         if(name != null){
             pageList = commonVipService
                     .lambdaQuery()
-                    .eq(CommonVip::getPid, iconId)
+//                    .eq(CommonVip::getPid, iconId)
                     .like(CommonVip::getName, name)
                     .page(page);
         }

module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java

@@ -132,7 +132,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
         if (commonAddress==null){
             return Result.error("地址不存在");
         }
-        //把list转为对象 list = [{"shopId":"1","num":1},{"shopId":"2","num":2}]
+        //把list转为对象 list = [{"shopId":"1","num":1,"pinId":1},{"shopId":"2","num":2,"pinId":1}]
         List<CommonOrder> list1 = JSON.parseArray(list, CommonOrder.class);
         //创建订单标识
         String orderId = IdWorker.getIdStr();
@@ -156,15 +156,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
                 }
                 //创建订单
                 BigDecimal price = commonShop.getPrice().multiply(new BigDecimal(sku.getNum()));
-
-//                //创建直推佣金
-//                BigDecimal oneMoney = commonShop.getOneMoney().multiply(new BigDecimal(sku.getNum()));
-//
-//                BigDecimal twoMoney = commonShop.getTwoMoney().multiply(new BigDecimal(sku.getNum()));
-
-
                 sku.setPid(orderId);
-
                 sku.setHasChild("0");
                 sku.setShopId(commonShop.getId());
                 sku.setTitle(commonShop.getName());
@@ -173,11 +165,9 @@ public class AppletOrderServiceImpl implements AppletOrderService {
                 sku.setNum(sku.getNum());
                 sku.setCreateTime(new Date());
                 sku.setPrice(price);
-//                sku.setOneMoney(oneMoney);
-//                sku.setTwoMoney(twoMoney);
-
                 sku.setImage(commonShop.getImage());
                 sku.setCreateTime(new Date());
+                sku.setPinId(sku.getPinId());
 
                 commonOrderService.save(sku);
 
@@ -186,10 +176,6 @@ public class AppletOrderServiceImpl implements AppletOrderService {
 
                 totalNum = totalNum + sku.getNum();
 
-//                totalOneMoney = totalOneMoney.add(oneMoney);
-//
-//                totalTwoMoney = totalTwoMoney.add(twoMoney);
-
             }
 
 
@@ -203,7 +189,6 @@ public class AppletOrderServiceImpl implements AppletOrderService {
             cityOrder.setName(commonAddress.getName());
             cityOrder.setPhone(commonAddress.getPhone());
             cityOrder.setAddressDetail(commonAddress.getAddressDetails());
-//            cityOrder.seta(addressId);
             cityOrder.setName(commonAddress.getName());
             cityOrder.setTitle("组合订单");
             cityOrder.setPrice(totalPrice);
@@ -211,11 +196,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
             cityOrder.setTwoMoney(totalTwoMoney);
             cityOrder.setPid("0");
             cityOrder.setHasChild("1");
-
-//            cityOrder.setShopState(2);
-
             cityOrder.setImage(null);
-//            cityOrder.setStatus("0");
             cityOrder.setStatus(0);
             cityOrder.setGoTime(strTime);
             cityOrder.setAddressId(addressId);

module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date:   2025-06-23
  * @Version: V1.0
  */
 @Api(tags="公共轮播图")

module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date:   2025-06-23
  * @Version: V1.0
  */
 @Data
@@ -59,4 +59,13 @@ public class CommonBanner implements Serializable {
 	@Excel(name = "说明", width = 15)
     @ApiModelProperty(value = "说明")
     private java.lang.String details;
+	/**类型*/
+	@Excel(name = "类型", width = 15, dicCode = "banner_type")
+	@Dict(dicCode = "banner_type")
+    @ApiModelProperty(value = "类型")
+    private java.lang.Integer type;
+	/**视频链接*/
+	@Excel(name = "视频链接", width = 15)
+    @ApiModelProperty(value = "视频链接")
+    private java.lang.String voUrl;
 }

module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date:   2025-06-23
  * @Version: V1.0
  */
 public interface CommonBannerMapper extends BaseMapper<CommonBanner> {

module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date:   2025-06-23
  * @Version: V1.0
  */
 public interface ICommonBannerService extends IService<CommonBanner> {

module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date:   2025-06-23
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import CommonBannerModal from './modules/CommonBannerModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'CommonBannerList',
@@ -137,6 +138,17 @@
             align:"center",
             dataIndex: 'details'
           },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'视频链接',
+            align:"center",
+            dataIndex: 'voUrl',
+            scopedSlots: {customRender: 'fileSlot'}
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -174,6 +186,8 @@
         fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
         fieldList.push({type:'Text',value:'details',text:'说明',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:'banner_type'})
+        fieldList.push({type:'Text',value:'voUrl',text:'视频链接',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue

@@ -18,6 +18,16 @@
               <a-textarea v-model="model.details" rows="4" 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="banner_type" placeholder="请选择类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="视频链接" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="voUrl">
+              <j-upload v-model="model.voUrl"   ></j-upload>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts

@@ -20,6 +20,17 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'details'
    },
+   {
+    title: '类型',
+    align:"center",
+    dataIndex: 'type_dictText'
+   },
+   {
+    title: '视频链接',
+    align:"center",
+    dataIndex: 'voUrl',
+    slots: { customRender: 'fileSlot' },
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -43,4 +54,19 @@ export const formSchema: FormSchema[] = [
     field: 'details',
     component: 'InputTextArea',//TODO 注意string转换问题
   },
+  {
+    label: '类型',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"banner_type"
+     },
+  },
+  {
+    label: '视频链接',
+    field: 'voUrl',
+    component: 'JUpload',
+    componentProps:{
+     },
+  },
 ];

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

@@ -175,5 +175,9 @@ public class CommonOrder implements Serializable {
 
 	@TableField (exist=false)
 	private List<CommonOrder> commonOrderList;
+	/**品牌标识*/
+	@Excel(name = "品牌标识", width = 15)
+	@ApiModelProperty(value = "品牌标识")
+	private java.lang.String pinId;
 
 }

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

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2025-05-21
+ * @Date:   2025-06-23
  * @Version: V1.0
  */
 @Api(tags="商品信息表")

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

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2025-05-21
+ * @Date:   2025-06-23
  * @Version: V1.0
  */
 @Data
@@ -113,4 +113,8 @@ public class CommonShop implements Serializable {
 	@Excel(name = "单位", width = 15)
     @ApiModelProperty(value = "单位")
     private java.lang.String unit;
+	/**是否品牌*/
+	@Excel(name = "是否品牌", width = 15)
+    @ApiModelProperty(value = "是否品牌")
+    private java.lang.String isPin;
 }

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2025-05-21
+ * @Date:   2025-06-23
  * @Version: V1.0
  */
 public interface CommonShopMapper extends BaseMapper<CommonShop> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2025-05-21
+ * @Date:   2025-06-23
  * @Version: V1.0
  */
 public interface ICommonShopService extends IService<CommonShop> {

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2025-05-21
+ * @Date:   2025-06-23
  * @Version: V1.0
  */
 @Service

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

@@ -5,21 +5,16 @@
       <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.shopCion" dict="common_vip,name,id"/>
+            <a-form-item label="商品分类">
+              <j-multi-select-tag placeholder="请选择商品分类" dictCode="common_shop_class,title,id" v-model="queryParam.shopClass"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="商品分类">
-              <j-multi-select-tag placeholder="请选择商品分类" dictCode="common_shop_class,title,id" v-model="queryParam.shopClass"/>
+            <a-form-item label="设置状态">
+              <j-dict-select-tag placeholder="请选择设置状态" v-model="queryParam.toolStatus" dictCode="book_tool_status"/>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="设置状态">
-                <j-dict-select-tag placeholder="请选择设置状态" v-model="queryParam.toolStatus" dictCode="book_tool_status"/>
-              </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.bookStatus" dictCode="book_my_status"/>
@@ -159,11 +154,6 @@
             align:"center",
             dataIndex: 'createTime'
           },
-          {
-            title:'关联品牌',
-            align:"center",
-            dataIndex: 'shopCion_dictText'
-          },
           {
             title:'商品分类',
             align:"center",
@@ -190,11 +180,6 @@
             align:"center",
             dataIndex: 'service'
           },
-          {
-            title:'回收规则',
-            align:"center",
-            dataIndex: 'details'
-          },
           {
             title:'价格',
             align:"center",
@@ -205,6 +190,12 @@
             align:"center",
             dataIndex: 'unit'
           },
+          {
+            title:'是否品牌',
+            align:"center",
+            dataIndex: 'isPin',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isPin'], text) : ''),
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -227,6 +218,7 @@
       }
     },
     created() {
+      this.$set(this.dictOptions, 'isPin', [{text:'是',value:'Y'},{text:'否',value:'N'}])
     this.getSuperFieldList();
     },
     computed: {
@@ -240,7 +232,6 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
-        fieldList.push({type:'sel_search',value:'shopCion',text:'关联品牌',dictTable:"common_vip", dictText:'name', dictCode:'id'})
         fieldList.push({type:'list_multi',value:'shopClass',text:'商品分类',dictTable:"common_shop_class", dictText:'title', dictCode:'id'})
         fieldList.push({type:'string',value:'name',text:'商品标题',dictCode:''})
         fieldList.push({type:'Text',value:'image',text:'商品图片',dictCode:''})
@@ -251,6 +242,7 @@
         fieldList.push({type:'int',value:'bookStatus',text:'作品状态',dictCode:'book_my_status'})
         fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
         fieldList.push({type:'string',value:'unit',text:'单位',dictCode:''})
+        fieldList.push({type:'switch',value:'isPin',text:'是否品牌'})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.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="shopCion">
-              <j-search-select-tag v-model="model.shopCion" dict="common_vip,name,id"  />
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="商品分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopClass">
               <j-multi-select-tag type="list_multi" v-model="model.shopClass" dictCode="common_shop_class,title,id" placeholder="请选择商品分类" />
@@ -35,7 +30,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="回收规则" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="details">
-              <a-input v-model="model.details" placeholder="请输入回收规则"  ></a-input>
+              <j-editor v-model="model.details" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -48,6 +43,11 @@
               <a-input v-model="model.unit" placeholder="请输入单位"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isPin">
+              <j-switch v-model="model.isPin"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

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

@@ -9,11 +9,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'createTime'
    },
-   {
-    title: '关联品牌',
-    align:"center",
-    dataIndex: 'shopCion_dictText'
-   },
    {
     title: '商品分类',
     align:"center",
@@ -40,11 +35,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'service'
    },
-   {
-    title: '回收规则',
-    align:"center",
-    dataIndex: 'details'
-   },
    {
     title: '价格',
     align:"center",
@@ -55,19 +45,18 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'unit'
    },
+   {
+    title: '是否品牌',
+    align:"center",
+    dataIndex: 'isPin',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
-      label: "关联品牌",
-      field: "shopCion",
-      component: 'JSearchSelect',
-      componentProps:{
-         dict:"common_vip,name,id"
-      },
-      colProps: {span: 6},
- 	},
-	{
       label: "商品分类",
       field: "shopClass",
       component: 'JMultiSelectTag',//暂无该组件
@@ -97,14 +86,6 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
-  {
-    label: '关联品牌',
-    field: 'shopCion',
-    component: 'JSearchSelect',
-    componentProps:{
-       dict:"common_vip,name,id"
-    },
-  },
   {
     label: '商品分类',
     field: 'shopClass',
@@ -141,7 +122,7 @@ export const formSchema: FormSchema[] = [
   {
     label: '回收规则',
     field: 'details',
-    component: 'Input',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
     label: '价格',
@@ -153,4 +134,11 @@ export const formSchema: FormSchema[] = [
     field: 'unit',
     component: 'Input',
   },
+  {
+    label: '是否品牌',
+    field: 'isPin',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
 ];

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

@@ -1,5 +1,5 @@
 server:
-  port: 8000
+  port: 8081
   tomcat:
     max-swallow-size: -1
   error:
@@ -192,11 +192,11 @@ jeecg :
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
-    accessKey: LTAI5tG9VnnPpjvcrQ3dtaYG
-    secretKey: h0nzWxMbH9RIeVVcFbtjTpocCj9GHc
-    endpoint:  oss-cn-shenzhen.aliyuncs.com
-    bucketName: buding-oss
-    staticDomain: https://oss.budingxiaoshuo.com
+    accessKey: LTAI5tDXgH5a42GbUZroVvio
+    secretKey: TK7jQ0KeXnFBHNxpEHzT83Spp81tl5
+    endpoint:  oss-cn-hangzhou.aliyuncs.com
+    bucketName: ossddmhs
+    staticDomain: https://oss.ddmhs.top
   # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES