From 288b80952b958d2bc34a400e8be446f795082dee Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Mon, 17 Mar 2025 11:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 1 + admin-pc/.env | 2 +- admin-pc/.env.development | 2 +- admin-pc/.env.production | 2 +- .../src/views/commonOrder0/CommonOrderList.vue | 301 ++++++++ .../views/commonOrder0/modules/CommonOrderForm.vue | 189 +++++ .../modules/CommonOrderModal.Style#Drawer.vue | 84 +++ .../commonOrder0/modules/CommonOrderModal.vue | 60 ++ admin-pc/src/views/dashboard/Analysis.vue | 816 +++++++++++++++------ .../api/controller/AppletIndexController.java | 55 +- .../org/jeecg/api/service/AppletIndexService.java | 8 +- .../api/service/impl/AppletIndexServiceImpl.java | 85 ++- .../jeecg/modules/commonBanner/bean/CountBean.java | 17 + .../commonBanner/mapper/CommonBannerMapper.java | 4 + .../commonBanner/mapper/xml/CommonBannerMapper.xml | 16 + .../commonBanner/service/ICommonBannerService.java | 4 +- .../service/impl/CommonBannerServiceImpl.java | 5 + .../controller/CommonordergiveController.java | 2 +- .../commonordergive/entity/Commonordergive.java | 27 +- .../mapper/CommonordergiveMapper.java | 2 +- .../service/ICommonordergiveService.java | 2 +- .../service/impl/CommonordergiveServiceImpl.java | 2 +- .../commonordergive/vue/CommonordergiveList.vue | 40 +- .../vue/modules/CommonordergiveForm.vue | 27 +- .../commonordergive/vue3/Commonordergive.data.ts | 73 +- 25 files changed, 1514 insertions(+), 312 deletions(-) create mode 100644 admin-pc/src/views/commonOrder0/CommonOrderList.vue create mode 100644 admin-pc/src/views/commonOrder0/modules/CommonOrderForm.vue create mode 100644 admin-pc/src/views/commonOrder0/modules/CommonOrderModal.Style#Drawer.vue create mode 100644 admin-pc/src/views/commonOrder0/modules/CommonOrderModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/bean/CountBean.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 3f5dc9d..011332d 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,7 @@ + diff --git a/admin-pc/.env b/admin-pc/.env index ab697bd..92219e3 100644 --- a/admin-pc/.env +++ b/admin-pc/.env @@ -1,4 +1,4 @@ -NODE_ENV=production +NODE_ENV=development VUE_APP_PLATFORM_NAME=陌美人珠宝管理系统 # 开启单点登录 VUE_APP_SSO=false diff --git a/admin-pc/.env.development b/admin-pc/.env.development index 9d58881..fcd30f8 100644 --- a/admin-pc/.env.development +++ b/admin-pc/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8001/jewelry-admin/ +VUE_APP_API_BASE_URL=https://admin.momeirenzhubao.com/jewelry-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-pc/.env.production b/admin-pc/.env.production index 2bdc95e..441a98d 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8001/jewelry-admin/ +VUE_APP_API_BASE_URL=https://admin.momeirenzhubao.com/jewelry-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-pc/src/views/commonOrder0/CommonOrderList.vue b/admin-pc/src/views/commonOrder0/CommonOrderList.vue new file mode 100644 index 0000000..3e18f03 --- /dev/null +++ b/admin-pc/src/views/commonOrder0/CommonOrderList.vue @@ -0,0 +1,301 @@ + + + + \ No newline at end of file diff --git a/admin-pc/src/views/commonOrder0/modules/CommonOrderForm.vue b/admin-pc/src/views/commonOrder0/modules/CommonOrderForm.vue new file mode 100644 index 0000000..9058b47 --- /dev/null +++ b/admin-pc/src/views/commonOrder0/modules/CommonOrderForm.vue @@ -0,0 +1,189 @@ + + + \ No newline at end of file diff --git a/admin-pc/src/views/commonOrder0/modules/CommonOrderModal.Style#Drawer.vue b/admin-pc/src/views/commonOrder0/modules/CommonOrderModal.Style#Drawer.vue new file mode 100644 index 0000000..fdc5994 --- /dev/null +++ b/admin-pc/src/views/commonOrder0/modules/CommonOrderModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/admin-pc/src/views/commonOrder0/modules/CommonOrderModal.vue b/admin-pc/src/views/commonOrder0/modules/CommonOrderModal.vue new file mode 100644 index 0000000..7e27362 --- /dev/null +++ b/admin-pc/src/views/commonOrder0/modules/CommonOrderModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/admin-pc/src/views/dashboard/Analysis.vue b/admin-pc/src/views/dashboard/Analysis.vue index 126a236..d859f35 100644 --- a/admin-pc/src/views/dashboard/Analysis.vue +++ b/admin-pc/src/views/dashboard/Analysis.vue @@ -1,292 +1,630 @@ - \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java index 58e76f1..b9e706f 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java @@ -179,8 +179,6 @@ public class AppletIndexController { - - //创建订单 @ApiOperation(value="创建订单", notes="创建订单") @GetMapping(value = "/createOrder") @@ -198,22 +196,23 @@ public class AppletIndexController { return apiRiceService.createOrderTwo(token,orderId); } -// -// //商城-加入购物车之后一次下多个订单 -// @ApiOperation(value="商城-加入购物车之后一次下多个订单", notes="商城-加入购物车之后一次下多个订单") -// @PostMapping("/createSumOrder") -// public Result createSumOrder(@RequestHeader("X-Access-Token") String token,String list,String addressId){ -// return apiRiceService.createSumOrder(token,list,addressId); -// } -// -// -// -// //商城-加入购物车之后一次下多个订单 - 再次下单 -// @ApiOperation(value="商城-加入购物车之后一次下多个订单 - 再次下单", notes="商城-加入购物车之后一次下多个订单 - 再次下单") -// @PostMapping("/createSumOrderAgain") -// public Result createSumOrderAgain(@RequestHeader("X-Access-Token") String token,String orderId){ -// return apiRiceService.createSumOrderAgain(token,orderId); -// } + + + //商城-加入购物车之后一次下多个订单 + @ApiOperation(value="商城-加入购物车之后一次下多个订单", notes="商城-加入购物车之后一次下多个订单") + @PostMapping("/createSumOrder") + public Result createSumOrder(@RequestHeader("X-Access-Token") String token,String list,String addressId){ + return apiRiceService.createSumOrder(token,list,addressId); + } + + + + //商城-加入购物车之后一次下多个订单 - 再次下单 + @ApiOperation(value="商城-加入购物车之后一次下多个订单 - 再次下单", notes="商城-加入购物车之后一次下多个订单 - 再次下单") + @PostMapping("/createSumOrderAgain") + public Result createSumOrderAgain(@RequestHeader("X-Access-Token") String token,String orderId){ + return apiRiceService.createSumOrderAgain(token,orderId); + } @@ -303,7 +302,27 @@ public class AppletIndexController { return apiRiceService.getGiveShopLottery(token,orderId,name,phone,address,addressDetails); } + //获取我的礼品订单 + @ApiOperation(value="获取我的礼品订单", notes="获取我的礼品订单") + @GetMapping(value = "/getMyGiftOrder") + public Result getMyGiftOrder(@RequestHeader("X-Access-Token") String token,Integer type,PageBean pageBean){ + return apiRiceService.getMyGiftOrder(token,type,pageBean); + } + //获取我的礼品订单详情 + @ApiOperation(value="获取我的礼品订单详情", notes="获取我的礼品订单详情") + @GetMapping(value = "/getMyGiftOrderDetail") + public Result getMyGiftOrderDetail(@RequestHeader("X-Access-Token") String token,String orderId){ + return apiRiceService.getMyGiftOrderDetail(token,orderId); + } + + + //获取统计数量信息 + @ApiOperation(value="获取统计数量信息", notes="获取统计数量信息") + @GetMapping(value = "/getCountInfo") + public Result getCountInfo(@RequestHeader("X-Access-Token") String token){ + return apiRiceService.getCountInfo(token); + } diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java b/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java index 2e4bee6..f62f45b 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java @@ -5,6 +5,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.commonAddress.entity.CommonAddress; import org.jeecg.modules.commonFack.entity.CommonFack; import org.jeecg.modules.commonUser.entity.CommonUser; +import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.RequestHeader; import java.math.BigDecimal; @@ -175,12 +176,17 @@ public interface AppletIndexService { Result getGiveShopLottery(String token,String orderId,String name,String phone,String address,String addressDetails); + //获取我的礼品订单 + Result getMyGiftOrder(String token,Integer type, PageBean pageBean); + //获取我的礼品订单详情 + Result getMyGiftOrderDetail(String token,String orderId); - + //获取统计数量信息 + public Result getCountInfo(@RequestHeader("X-Access-Token") String token); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java index 1841582..8c5dcbc 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java @@ -22,6 +22,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.commonAddress.entity.CommonAddress; import org.jeecg.modules.commonAddress.service.ICommonAddressService; +import org.jeecg.modules.commonBanner.bean.CountBean; import org.jeecg.modules.commonBanner.entity.CommonBanner; import org.jeecg.modules.commonBanner.service.ICommonBannerService; import org.jeecg.modules.commonCat.entity.CommonCat; @@ -298,10 +299,10 @@ public class AppletIndexServiceImpl implements AppletIndexService { if (commonOrder.getState()==1){ return Result.error("订单已支付"); } - //查询订单是否shopState不等于2 - if (commonOrder.getShopState()==2){ - return Result.error("非首页订单"); - } +// //查询订单是否shopState不等于2 +// if (commonOrder.getShopState()==2){ +// return Result.error("非首页订单"); +// } // // //根据配置列表查询每人限制数量 // CommonConfig commonConfig = commonConfigService.lambdaQuery() @@ -418,6 +419,8 @@ public class AppletIndexServiceImpl implements AppletIndexService { }else{ commonOrder.setState(1); commonOrderService.updateById(commonOrder); + //修改用户余额 + return Result.OK(newOrderId); } @@ -1149,7 +1152,7 @@ public class AppletIndexServiceImpl implements AppletIndexService { String qrCodeImageUrl = image_go_url.getKeyContent()+this.uploadAliYunOss(mf); String backgroundImageUrl = qr_code.getKeyContent(); - String outputFilePath = "combined_image.png"; + String outputFilePath = "combined_image_code"; String s = this.generateAndCombineImagesFromUrl(qrCodeImageUrl, backgroundImageUrl, outputFilePath); wxCodeVo.setUrl(s); wxCodeVo.setName("陌美人珠宝欢迎您"); @@ -1938,11 +1941,13 @@ public class AppletIndexServiceImpl implements AppletIndexService { if(list.size()>0){ CommonOrderTitle commonOrderTitle = list.get(new Random().nextInt(list.size())); map.put("words",commonOrderTitle.getTitle()); + return Result.OK(commonOrderTitle.getTitle()); }else{ map.put("words","祝你生日快乐"); + return Result.OK("恭喜你收到一条祝福"); } - map.put("list",list); - return Result.OK("反馈成功"); +// map.put("list",list); +// return Result.OK(commonOrderTitle.getTitle()); } @@ -1987,7 +1992,10 @@ public class AppletIndexServiceImpl implements AppletIndexService { Commonordergive commonordergive = new Commonordergive(); commonordergive.setOrderId(orderId); commonordergive.setUserId(hanHaiMember.getId()); - commonordergive.setTitle(commonOrder.getGiveTitle()); + commonordergive.setGiveId(commonOrder.getUserId()); + commonordergive.setTitle(commonOrder.getTitle()); + commonordergive.setMessage(commonOrder.getGiveTitle()); + commonordergive.setPrice(commonOrder.getPrice()); commonordergive.setImage(commonOrder.getGiveImage()); commonordergive.setName(commonOrder.getName()); commonordergive.setPhone(commonOrder.getPhone()); @@ -2002,9 +2010,13 @@ public class AppletIndexServiceImpl implements AppletIndexService { //创建送礼记录 Commonordergive commonordergive1 = new Commonordergive(); commonordergive1.setOrderId(orderId); - commonordergive1.setUserId(commonOrder.getUserId()); - commonordergive1.setTitle(commonOrder.getTitle()); - commonordergive.setImage(commonOrder.getGiveImage()); + commonordergive1.setUserId(hanHaiMember.getId()); + commonordergive.setGiveId(commonOrder.getUserId()); + commonordergive.setTitle(commonOrder.getTitle()); + commonordergive.setMessage(commonOrder.getGiveTitle()); + + commonordergive.setImage(commonOrder.getImage()); + commonordergive.setPrice(commonOrder.getPrice()); commonordergive.setName(commonOrder.getName()); commonordergive.setPhone(commonOrder.getPhone()); commonordergive.setAddress(commonOrder.getAddress()); @@ -2039,7 +2051,10 @@ public class AppletIndexServiceImpl implements AppletIndexService { Commonordergive commonordergive = new Commonordergive(); commonordergive.setOrderId(orderId); commonordergive.setUserId(hanHaiMember.getId()); - commonordergive.setTitle(commonOrder.getGiveTitle()); + commonordergive.setGiveId(commonOrder.getUserId()); + commonordergive.setTitle(commonOrder.getTitle()); + commonordergive.setMessage(commonOrder.getGiveTitle()); + commonordergive.setPrice(commonOrder.getPrice()); commonordergive.setImage(commonOrder.getGiveImage()); commonordergive.setName(commonOrder.getName()); commonordergive.setPhone(commonOrder.getPhone()); @@ -2054,9 +2069,13 @@ public class AppletIndexServiceImpl implements AppletIndexService { //创建送礼记录 Commonordergive commonordergive1 = new Commonordergive(); commonordergive1.setOrderId(orderId); - commonordergive1.setUserId(commonOrder.getUserId()); + commonordergive1.setUserId(hanHaiMember.getId()); commonordergive1.setTitle(commonOrder.getTitle()); - commonordergive.setImage(commonOrder.getGiveImage()); + commonordergive.setGiveId(commonOrder.getUserId()); + commonordergive.setTitle(commonOrder.getTitle()); + commonordergive.setMessage(commonOrder.getGiveTitle()); + commonordergive.setImage(commonOrder.getImage()); + commonordergive.setPrice(commonOrder.getPrice()); commonordergive.setName(commonOrder.getName()); commonordergive.setPhone(commonOrder.getPhone()); commonordergive.setAddress(commonOrder.getAddress()); @@ -2071,4 +2090,42 @@ public class AppletIndexServiceImpl implements AppletIndexService { return Result.error("很遗憾，您没有领取到"); } } + + //获取我的礼品订单 + @Override + public Result getMyGiftOrder(String token,Integer type, PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + if (hanHaiMember==null){ + return Result.error("用户不存在"); + } + //查询列表数据带分页 + Page page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize()); + Page page1 = commonordergiveService.lambdaQuery() + .eq(Commonordergive::getUserId, hanHaiMember.getId()) + .eq(Commonordergive::getType, type) + .orderByDesc(Commonordergive::getCreateTime) + .page(page); + + return Result.OK(page1); + } + + + + //获取我的礼品订单详情 + @Override + public Result getMyGiftOrderDetail(String token,String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + return Result.OK(commonordergiveService.getById(orderId)); + } + + //获取统计数量信息 + @Override + public Result getCountInfo(String token){ + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CountBean countbean = commonBannerService.getCountInfo(); + return Result.OK(countbean); + } + + + } diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/bean/CountBean.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/bean/CountBean.java new file mode 100644 index 0000000..6150176 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/bean/CountBean.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonBanner.bean; + +import lombok.Data; + +@Data +public class CountBean { + private Integer order0;//订单数量-未支付 + private Integer order1;//订单数量-待发货 + private Integer order2;//订单数量-待收货 + private Integer order3;//订单数量-已完成 + private Integer order4;//订单数量-已取消 + + private Integer role0;//会员等级-普通成员 + private Integer role1;//会员等级-银卡会员 + private Integer role2;//会员等级-金卡会员 + private Integer role3;//会员等级-钻卡会员 +} 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 f225b0c..85526a7 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 @@ -3,6 +3,7 @@ package org.jeecg.modules.commonBanner.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonBanner.bean.CountBean; import org.jeecg.modules.commonBanner.entity.CommonBanner; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface CommonBannerMapper extends BaseMapper { + //获取统计信息 + public CountBean getCountInfo(); + } diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/xml/CommonBannerMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/xml/CommonBannerMapper.xml index 5fc1f08..172fee9 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/xml/CommonBannerMapper.xml +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/xml/CommonBannerMapper.xml @@ -2,4 +2,20 @@ + + \ No newline at end of file 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 e6c6532..4acde81 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 @@ -1,5 +1,6 @@ package org.jeecg.modules.commonBanner.service; +import org.jeecg.modules.commonBanner.bean.CountBean; import org.jeecg.modules.commonBanner.entity.CommonBanner; import com.baomidou.mybatisplus.extension.service.IService; @@ -10,5 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Version: V1.0 */ public interface ICommonBannerService extends IService { - + //获取统计信息 + public CountBean getCountInfo(); } 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 eae3487..1706237 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 @@ -1,5 +1,6 @@ package org.jeecg.modules.commonBanner.service.impl; +import org.jeecg.modules.commonBanner.bean.CountBean; import org.jeecg.modules.commonBanner.entity.CommonBanner; import org.jeecg.modules.commonBanner.mapper.CommonBannerMapper; import org.jeecg.modules.commonBanner.service.ICommonBannerService; @@ -16,4 +17,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class CommonBannerServiceImpl extends ServiceImpl implements ICommonBannerService { + @Override + public CountBean getCountInfo() { + return baseMapper.getCountInfo(); + } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/controller/CommonordergiveController.java b/module-common/src/main/java/org/jeecg/modules/commonordergive/controller/CommonordergiveController.java index 66076ce..b234094 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonordergive/controller/CommonordergiveController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/controller/CommonordergiveController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 礼品订单 * @Author: jeecg-boot - * @Date: 2025-02-23 + * @Date: 2025-02-24 * @Version: V1.0 */ @Api(tags="礼品订单") diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/entity/Commonordergive.java b/module-common/src/main/java/org/jeecg/modules/commonordergive/entity/Commonordergive.java index 0d80ff7..c2ef4ef 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonordergive/entity/Commonordergive.java +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/entity/Commonordergive.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 礼品订单 * @Author: jeecg-boot - * @Date: 2025-02-23 + * @Date: 2025-02-24 * @Version: V1.0 */ @Data @@ -48,11 +48,13 @@ public class Commonordergive implements Serializable { @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; /**类型*/ - @Excel(name = "类型", width = 15) + @Excel(name = "类型", width = 15, dicCode = "type_give") + @Dict(dicCode = "type_give") @ApiModelProperty(value = "类型") private java.lang.Integer type; /**礼品类型*/ - @Excel(name = "礼品类型", width = 15) + @Excel(name = "礼品类型", width = 15, dicCode = "give_state") + @Dict(dicCode = "give_state") @ApiModelProperty(value = "礼品类型") private java.lang.Integer isGive; /**礼品标题*/ @@ -64,7 +66,8 @@ public class Commonordergive implements Serializable { @ApiModelProperty(value = "礼品图片") private java.lang.String image; /**关联商品*/ - @Excel(name = "关联商品", width = 15) + @Excel(name = "关联商品", width = 15, dictTable = "common_order", dicText = "title", dicCode = "id") + @Dict(dictTable = "common_order", dicText = "title", dicCode = "id") @ApiModelProperty(value = "关联商品") private java.lang.String orderId; /**收货人*/ @@ -88,7 +91,21 @@ public class Commonordergive implements Serializable { @ApiModelProperty(value = "领取状态") 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; + /**祝福语*/ + @Excel(name = "祝福语", width = 15) + @ApiModelProperty(value = "祝福语") + private java.lang.String message; + /**送礼人*/ + @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 giveId; + /**礼品价值*/ + @Excel(name = "礼品价值", width = 15) + @ApiModelProperty(value = "礼品价值") + private java.math.BigDecimal price; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/CommonordergiveMapper.java b/module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/CommonordergiveMapper.java index b0871d1..e6aed2c 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/CommonordergiveMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/CommonordergiveMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 礼品订单 * @Author: jeecg-boot - * @Date: 2025-02-23 + * @Date: 2025-02-24 * @Version: V1.0 */ public interface CommonordergiveMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/service/ICommonordergiveService.java b/module-common/src/main/java/org/jeecg/modules/commonordergive/service/ICommonordergiveService.java index ff79b23..1070533 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonordergive/service/ICommonordergiveService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/service/ICommonordergiveService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 礼品订单 * @Author: jeecg-boot - * @Date: 2025-02-23 + * @Date: 2025-02-24 * @Version: V1.0 */ public interface ICommonordergiveService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/service/impl/CommonordergiveServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonordergive/service/impl/CommonordergiveServiceImpl.java index cf37642..2499b03 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonordergive/service/impl/CommonordergiveServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/service/impl/CommonordergiveServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 礼品订单 * @Author: jeecg-boot - * @Date: 2025-02-23 + * @Date: 2025-02-24 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/CommonordergiveList.vue b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/CommonordergiveList.vue index 3752d43..48428e9 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/CommonordergiveList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/CommonordergiveList.vue @@ -99,6 +99,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import CommonordergiveModal from './modules/CommonordergiveModal' + import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'CommonordergiveList', @@ -124,12 +125,12 @@ { title:'类型', align:"center", - dataIndex: 'type' + dataIndex: 'type_dictText' }, { title:'礼品类型', align:"center", - dataIndex: 'isGive' + dataIndex: 'isGive_dictText' }, { title:'礼品标题', @@ -139,12 +140,13 @@ { title:'礼品图片', align:"center", - dataIndex: 'image' + dataIndex: 'image', + scopedSlots: {customRender: 'imgSlot'} }, { title:'关联商品', align:"center", - dataIndex: 'orderId' + dataIndex: 'orderId_dictText' }, { title:'收货人', @@ -169,12 +171,27 @@ { title:'领取状态', align:"center", - dataIndex: 'state' + dataIndex: 'state_dictText' }, { title:'领取用户', align:"center", - dataIndex: 'userId' + dataIndex: 'userId_dictText' + }, + { + title:'祝福语', + align:"center", + dataIndex: 'message' + }, + { + title:'送礼人', + align:"center", + dataIndex: 'giveId_dictText' + }, + { + title:'礼品价值', + align:"center", + dataIndex: 'price' }, { title: '操作', @@ -210,17 +227,20 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'int',value:'type',text:'类型',dictCode:''}) - fieldList.push({type:'int',value:'isGive',text:'礼品类型',dictCode:''}) + fieldList.push({type:'int',value:'type',text:'类型',dictCode:'type_give'}) + fieldList.push({type:'int',value:'isGive',text:'礼品类型',dictCode:'give_state'}) fieldList.push({type:'string',value:'title',text:'礼品标题',dictCode:''}) fieldList.push({type:'Text',value:'image',text:'礼品图片',dictCode:''}) - fieldList.push({type:'Text',value:'orderId',text:'关联商品',dictCode:''}) + fieldList.push({type:'sel_search',value:'orderId',text:'关联商品',dictTable:"common_order", dictText:'title', dictCode:'id'}) fieldList.push({type:'string',value:'name',text:'收货人',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''}) fieldList.push({type:'string',value:'address',text:'所在地区',dictCode:''}) fieldList.push({type:'Text',value:'addressDetails',text:'详细地址',dictCode:''}) fieldList.push({type:'int',value:'state',text:'领取状态',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:'message',text:'祝福语',dictCode:''}) + fieldList.push({type:'sel_search',value:'giveId',text:'送礼人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) + fieldList.push({type:'BigDecimal',value:'price',text:'礼品价值',dictCode:''}) this.superFieldList = fieldList } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveForm.vue b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveForm.vue index 02665dc..8c62fe9 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveForm.vue @@ -5,12 +5,12 @@ - + - + @@ -20,12 +20,12 @@ - + - + @@ -50,12 +50,27 @@ - + - + + + + + + + + + + + + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.data.ts b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.data.ts index a20e826..31a31b7 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.data.ts @@ -7,12 +7,12 @@ export const columns: BasicColumn[] = [ { title: '类型', align:"center", - dataIndex: 'type' + dataIndex: 'type_dictText' }, { title: '礼品类型', align:"center", - dataIndex: 'isGive' + dataIndex: 'isGive_dictText' }, { title: '礼品标题', @@ -22,12 +22,13 @@ export const columns: BasicColumn[] = [ { title: '礼品图片', align:"center", - dataIndex: 'image' + dataIndex: 'image', + customRender:render.renderAvatar, }, { title: '关联商品', align:"center", - dataIndex: 'orderId' + dataIndex: 'orderId_dictText' }, { title: '收货人', @@ -52,12 +53,27 @@ export const columns: BasicColumn[] = [ { title: '领取状态', align:"center", - dataIndex: 'state' + dataIndex: 'state_dictText' }, { title: '领取用户', align:"center", - dataIndex: 'userId' + dataIndex: 'userId_dictText' + }, + { + title: '祝福语', + align:"center", + dataIndex: 'message' + }, + { + title: '送礼人', + align:"center", + dataIndex: 'giveId_dictText' + }, + { + title: '礼品价值', + align:"center", + dataIndex: 'price' }, ]; //查询数据 @@ -68,12 +84,18 @@ export const formSchema: FormSchema[] = [ { label: '类型', field: 'type', - component: 'InputNumber', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"type_give" + }, }, { label: '礼品类型', field: 'isGive', - component: 'InputNumber', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"give_state" + }, }, { label: '礼品标题', @@ -83,12 +105,17 @@ export const formSchema: FormSchema[] = [ { label: '礼品图片', field: 'image', - component: 'Input', + component: 'JImageUpload', + componentProps:{ + }, }, { label: '关联商品', field: 'orderId', - component: 'Input', + component: 'JSearchSelect', + componentProps:{ + dict:"common_order,title,id" + }, }, { label: '收货人', @@ -113,11 +140,35 @@ export const formSchema: FormSchema[] = [ { label: '领取状态', field: 'state', - component: 'InputNumber', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"" + }, }, { label: '领取用户', field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '祝福语', + field: 'message', component: 'Input', }, + { + label: '送礼人', + field: 'giveId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '礼品价值', + field: 'price', + component: 'InputNumber', + }, ];