diff --git a/admin-pc/public/logo.png b/admin-pc/public/logo.png index a58518d..7b662b1 100644 Binary files a/admin-pc/public/logo.png and b/admin-pc/public/logo.png differ diff --git a/admin-pc/src/assets/logo.png b/admin-pc/src/assets/logo.png index a58518d..7b662b1 100644 Binary files a/admin-pc/src/assets/logo.png and b/admin-pc/src/assets/logo.png differ diff --git a/admin-pc/src/views/dashboard/Analysis.vue b/admin-pc/src/views/dashboard/Analysis.vue index 7eaf406..cb47560 100644 --- a/admin-pc/src/views/dashboard/Analysis.vue +++ b/admin-pc/src/views/dashboard/Analysis.vue @@ -1,115 +1,97 @@ - + + + + + + + - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java index 0ed1d83..e585051 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java @@ -75,13 +75,13 @@ public class AppletClassServiceImpl implements AppletClassService { Page page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize()); IPage 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); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java index 35647ed..73cd958 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java +++ b/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 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); diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java index 319253f..2588d6c 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java +++ b/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="公共轮播图") diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java index 8f2ace1..4fc5849 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java +++ b/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; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java index 425d62c..f0284ac 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java +++ b/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 { diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java index 465a8b2..7042f8f 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java +++ b/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 { diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java index 8b605a8..b28a803 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java +++ b/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 diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue index 81d9ffa..dd42524 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue +++ b/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 } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue index 28a979b..197f1c5 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue @@ -18,6 +18,16 @@ + + + + + + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts index 39405d3..2f50800 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts +++ b/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:{ + }, + }, ]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java index 1d37bf3..61f460c 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java +++ b/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 commonOrderList; + /**品牌标识*/ + @Excel(name = "品牌标识", width = 15) + @ApiModelProperty(value = "品牌标识") + private java.lang.String pinId; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java b/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java index 9603d3f..f8e0d8e 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java +++ b/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="商品信息表") diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java index dfa0fab..964f722 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java +++ b/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; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java b/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java index e60cbdf..2851a2c 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java +++ b/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 { diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java b/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java index 5060687..872b340 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java +++ b/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 { diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java index 698858a..119734b 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java +++ b/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 diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue index c144955..639598a 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue @@ -5,21 +5,16 @@ - - + + - - + +