From 7f59669906db7e6eb4911c69acec0decba151ea0 Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Mon, 24 Feb 2025 00:34:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A2=9E=E5=8A=A0=EF=BC=9A?= =?UTF-8?q?=E9=80=81=E7=A4=BC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/AppletIndexController.java | 51 ++++- .../org/jeecg/api/service/AppletIndexService.java | 30 ++- .../api/service/impl/AppletIndexServiceImpl.java | 176 +++++++++++++++- .../controller/CommonOrderController.java | 2 +- .../modules/commonOrder/entity/CommonOrder.java | 24 ++- .../commonOrder/mapper/CommonOrderMapper.java | 2 +- .../commonOrder/service/ICommonOrderService.java | 2 +- .../service/impl/CommonOrderServiceImpl.java | 2 +- .../modules/commonOrder/vue/CommonOrderList.vue | 11 + .../commonOrder/vue/modules/CommonOrderForm.vue | 5 + .../modules/commonOrder/vue3/CommonOrder.data.ts | 22 ++ .../controller/CommonOrderImageController.java | 171 +++++++++++++++ .../entity/CommonOrderImage.java} | 36 ++-- .../mapper/CommonOrderImageMapper.java | 17 ++ .../mapper/xml/CommonOrderImageMapper.xml} | 2 +- .../service/ICommonOrderImageService.java | 14 ++ .../service/impl/CommonOrderImageServiceImpl.java | 19 ++ .../vue/CommonOrderImageList.vue} | 47 ++--- .../vue/modules/CommonOrderImageForm.vue} | 26 +-- .../CommonOrderImageModal.Style#Drawer.vue} | 8 +- .../vue/modules/CommonOrderImageModal.vue} | 8 +- .../vue3/CommonOrderImage.api.ts} | 14 +- .../commonOrderImage/vue3/CommonOrderImage.data.ts | 36 ++++ .../vue3/CommonOrderImageList.vue} | 14 +- .../vue3/components/CommonOrderImageModal.vue} | 4 +- .../controller/CommonOrderTitleController.java} | 84 ++++---- .../commonOrderTitle/entity/CommonOrderTitle.java | 54 +++++ .../mapper/CommonOrderTitleMapper.java | 17 ++ .../mapper/xml/CommonOrderTitleMapper.xml | 5 + .../service/ICommonOrderTitleService.java | 14 ++ .../service/impl/CommonOrderTitleServiceImpl.java | 19 ++ .../commonOrderTitle/vue/CommonOrderTitleList.vue | 171 +++++++++++++++ .../vue/modules/CommonOrderTitleForm.vue | 104 ++++++++++ .../modules/CommonOrderTitleModal.Style#Drawer.vue | 84 ++++++++ .../vue/modules/CommonOrderTitleModal.vue | 60 ++++++ .../commonOrderTitle/vue3/CommonOrderTitle.api.ts | 61 ++++++ .../commonOrderTitle/vue3/CommonOrderTitle.data.ts | 23 ++ .../commonOrderTitle/vue3/CommonOrderTitleList.vue | 162 +++++++++++++++ .../vue3/components/CommonOrderTitleModal.vue | 58 ++++++ .../controller/CommonordergiveController.java | 171 +++++++++++++++ .../commonordergive/entity/Commonordergive.java | 94 +++++++++ .../mapper/CommonordergiveMapper.java | 17 ++ .../mapper/xml/CommonordergiveMapper.xml | 5 + .../service/ICommonordergiveService.java | 14 ++ .../service/impl/CommonordergiveServiceImpl.java | 19 ++ .../commonordergive/vue/CommonordergiveList.vue | 231 +++++++++++++++++++++ .../vue/modules/CommonordergiveForm.vue | 154 ++++++++++++++ .../modules/CommonordergiveModal.Style#Drawer.vue | 84 ++++++++ .../vue/modules/CommonordergiveModal.vue | 60 ++++++ .../commonordergive/vue3/Commonordergive.api.ts | 61 ++++++ .../commonordergive/vue3/Commonordergive.data.ts | 123 +++++++++++ .../commonordergive/vue3/CommonordergiveList.vue | 162 +++++++++++++++ .../vue3/components/CommonordergiveModal.vue | 58 ++++++ .../mapper/PopularizeRecruitLogMapper.java | 17 -- .../service/IPopularizeRecruitLogService.java | 14 -- .../impl/PopularizeRecruitLogServiceImpl.java | 19 -- .../vue3/PopularizeRecruitLog.data.ts | 53 ----- 57 files changed, 2762 insertions(+), 253 deletions(-) create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderImage/controller/CommonOrderImageController.java rename module-common/src/main/java/org/jeecg/modules/{popularizeRecruitLog/entity/PopularizeRecruitLog.java => commonOrderImage/entity/CommonOrderImage.java} (62%) create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderImage/mapper/CommonOrderImageMapper.java rename module-common/src/main/java/org/jeecg/modules/{popularizeRecruitLog/mapper/xml/PopularizeRecruitLogMapper.xml => commonOrderImage/mapper/xml/CommonOrderImageMapper.xml} (58%) create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderImage/service/ICommonOrderImageService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderImage/service/impl/CommonOrderImageServiceImpl.java rename module-common/src/main/java/org/jeecg/modules/{popularizeRecruitLog/vue/PopularizeRecruitLogList.vue => commonOrderImage/vue/CommonOrderImageList.vue} (77%) rename module-common/src/main/java/org/jeecg/modules/{popularizeRecruitLog/vue/modules/PopularizeRecruitLogForm.vue => commonOrderImage/vue/modules/CommonOrderImageForm.vue} (65%) rename module-common/src/main/java/org/jeecg/modules/{popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.Style#Drawer.vue => commonOrderImage/vue/modules/CommonOrderImageModal.Style#Drawer.vue} (85%) rename module-common/src/main/java/org/jeecg/modules/{popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.vue => commonOrderImage/vue/modules/CommonOrderImageModal.vue} (79%) rename module-common/src/main/java/org/jeecg/modules/{popularizeRecruitLog/vue3/PopularizeRecruitLog.api.ts => commonOrderImage/vue3/CommonOrderImage.api.ts} (71%) create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue3/CommonOrderImage.data.ts rename module-common/src/main/java/org/jeecg/modules/{popularizeRecruitLog/vue3/PopularizeRecruitLogList.vue => commonOrderImage/vue3/CommonOrderImageList.vue} (90%) rename module-common/src/main/java/org/jeecg/modules/{popularizeRecruitLog/vue3/components/PopularizeRecruitLogModal.vue => commonOrderImage/vue3/components/CommonOrderImageModal.vue} (93%) rename module-common/src/main/java/org/jeecg/modules/{popularizeRecruitLog/controller/PopularizeRecruitLogController.java => commonOrderTitle/controller/CommonOrderTitleController.java} (51%) create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/entity/CommonOrderTitle.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/mapper/CommonOrderTitleMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/mapper/xml/CommonOrderTitleMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/service/ICommonOrderTitleService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/service/impl/CommonOrderTitleServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/CommonOrderTitleList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitle.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitle.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitleList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/components/CommonOrderTitleModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/controller/CommonordergiveController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/entity/Commonordergive.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/CommonordergiveMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/xml/CommonordergiveMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/service/ICommonordergiveService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/service/impl/CommonordergiveServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/vue/CommonordergiveList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/CommonordergiveList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/components/CommonordergiveModal.vue delete mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/PopularizeRecruitLogMapper.java delete mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/IPopularizeRecruitLogService.java delete mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/impl/PopularizeRecruitLogServiceImpl.java delete mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.data.ts 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 4776f0f..58e76f1 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 @@ -184,8 +184,8 @@ public class AppletIndexController { //创建订单 @ApiOperation(value="创建订单", notes="创建订单") @GetMapping(value = "/createOrder") - public Result createOrder(@RequestHeader("X-Access-Token") String token, String shopId, Integer num,String addressId,Integer payType,String couponId) { - return apiRiceService.createOrder(token,shopId,num,addressId,payType,couponId); + public Result createOrder(@RequestHeader("X-Access-Token") String token, String shopId, Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum) { + return apiRiceService.createOrder(token,shopId,num,addressId,payType,couponId,isGive,memberNum,giveNum); } @@ -260,4 +260,51 @@ public class AppletIndexController { + //获取祝福背景图 + @ApiOperation(value="获取祝福背景图", notes="获取祝福背景图") + @GetMapping(value = "/getRiceBlessing") + public Result getRiceBlessingList(){ + return apiRiceService.getRiceBlessingList(); + } + + + + //随机获取祝福语 + @ApiOperation(value="随机获取祝福语", notes="随机获取祝福语") + @GetMapping(value = "/getRiceBlessingWords") + public Result getRiceBlessingWords(){ + return apiRiceService.getRiceBlessingWords(); + } + + + //根据订单标识修改订单祝福语背景 + @ApiOperation(value="根据订单标识修改订单祝福语背景", notes="根据订单标识修改订单祝福语背景") + @PostMapping(value = "/updateOrderBlessing") + public Result updateOrderBlessing(@RequestHeader("X-Access-Token") String token,String orderId,String giveTitle,String giveImage){ + return apiRiceService.updateOrderBlessing(token,orderId,giveTitle,giveImage); + } + + + + + + //1.收礼流程 =》点击收礼 + @ApiOperation(value="1.收礼流程 =》点击收礼", notes="1.收礼流程 =》点击收礼") + @GetMapping(value = "/getGiveShop") + public Result getGiveShop(@RequestHeader("X-Access-Token") String token,String orderId,String name,String phone,String address,String addressDetails){ + return apiRiceService.getGiveShop(token,orderId,name,phone,address,addressDetails); + } + + + //2.点击抽奖 =》抽奖 + @ApiOperation(value="2.点击抽奖 =》抽奖", notes="2.点击抽奖 =》抽奖") + @GetMapping(value = "/getGiveShopLottery") + public Result getGiveShopLottery(@RequestHeader("X-Access-Token") String token,String orderId,String name,String phone,String address,String addressDetails){ + return apiRiceService.getGiveShopLottery(token,orderId,name,phone,address,addressDetails); + } + + + + + } 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 4cae1db..2e4bee6 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 @@ -42,7 +42,7 @@ public interface AppletIndexService { //创建订单 - Result createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId); + Result createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum); //再次支付 @@ -155,4 +155,32 @@ public interface AppletIndexService { Result addFeedback(String token, CommonFack feedback); + + + //获取祝福背景图 + Result getRiceBlessingList(); + + //随机获取祝福语 + Result getRiceBlessingWords(); + + + //根据订单标识修改订单祝福语背景 + Result updateOrderBlessing(String token,String orderId,String blessingId,String blessingWords); + + + //1.收礼流程 =》点击收礼 + Result getGiveShop(String token,String orderId,String name,String phone,String address,String addressDetails); + + //2.点击抽奖 =》抽奖 + Result getGiveShopLottery(String token,String orderId,String name,String phone,String address,String addressDetails); + + + + + + + + + + } 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 558d946..1841582 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 @@ -48,8 +48,12 @@ import org.jeecg.modules.commonNotice.entity.CommonNotice; import org.jeecg.modules.commonNotice.service.ICommonNoticeService; import org.jeecg.modules.commonOrder.entity.CommonOrder; import org.jeecg.modules.commonOrder.service.ICommonOrderService; +import org.jeecg.modules.commonOrderImage.entity.CommonOrderImage; +import org.jeecg.modules.commonOrderImage.service.ICommonOrderImageService; import org.jeecg.modules.commonOrderSku.entity.CommonOrderSku; import org.jeecg.modules.commonOrderSku.service.ICommonOrderSkuService; +import org.jeecg.modules.commonOrderTitle.entity.CommonOrderTitle; +import org.jeecg.modules.commonOrderTitle.service.ICommonOrderTitleService; import org.jeecg.modules.commonPidClass.entity.CommonPidClass; import org.jeecg.modules.commonPidClass.service.ICommonPidClassService; import org.jeecg.modules.commonShop.entity.CommonShop; @@ -60,6 +64,8 @@ import org.jeecg.modules.commonVip.entity.CommonVip; import org.jeecg.modules.commonVip.service.ICommonVipService; import org.jeecg.modules.commonVipConfig.entity.CommonVipConfig; import org.jeecg.modules.commonVipConfig.service.ICommonVipConfigService; +import org.jeecg.modules.commonordergive.entity.Commonordergive; +import org.jeecg.modules.commonordergive.service.ICommonordergiveService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.pay.MpWxPayService; @@ -148,7 +154,12 @@ public class AppletIndexServiceImpl implements AppletIndexService { @Resource private ICommonPidClassService commonPidClassService; - + @Autowired + private ICommonOrderImageService commonOrderImageService; + @Autowired + private ICommonOrderTitleService commonOrderTitleService; + @Autowired + private ICommonordergiveService commonordergiveService; @@ -403,11 +414,11 @@ public class AppletIndexServiceImpl implements AppletIndexService { hanHaiMember.getAppletOpenid(), commonOrder.toString()); - return Result.OK("支付成功",appOrder); + return Result.OK(newOrderId,appOrder); }else{ commonOrder.setState(1); commonOrderService.updateById(commonOrder); - return Result.error("支付成功"); + return Result.OK(newOrderId); } @@ -415,7 +426,7 @@ public class AppletIndexServiceImpl implements AppletIndexService { //创建订单 @Override - public Result createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId) { + public Result createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum) { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //支付方式不能为空 if (payType==null){ @@ -500,6 +511,9 @@ public class AppletIndexServiceImpl implements AppletIndexService { //生成订单信息 CommonOrder commonOrder = new CommonOrder(); + commonOrder.setIsGive(isGive); + commonOrder.setMemberNum(memberNum); + commonOrder.setGiveNum(giveNum); commonOrder.setId(orderId); commonOrder.setTitle(commonShop.getTitle()); @@ -549,11 +563,11 @@ public class AppletIndexServiceImpl implements AppletIndexService { hanHaiMember.getAppletOpenid(), commonOrder.toString()); - return Result.OK("支付成功",appOrder); + return Result.OK(orderId,appOrder); }else{ commonOrder.setState(1); commonOrderService.updateById(commonOrder); - return Result.error("支付成功"); + return Result.OK(orderId); } } @@ -1907,4 +1921,154 @@ public class AppletIndexServiceImpl implements AppletIndexService { } + + //获取祝福背景图 + @Override + public Result getRiceBlessingList(){ + List list = commonOrderImageService.list(); + return Result.OK(list); + } + + //随机获取祝福语 + @Override + public Result getRiceBlessingWords(){ + Map map = new HashMap(); + //随机得到一条祝福语 + List list = commonOrderTitleService.list(); + if(list.size()>0){ + CommonOrderTitle commonOrderTitle = list.get(new Random().nextInt(list.size())); + map.put("words",commonOrderTitle.getTitle()); + }else{ + map.put("words","祝你生日快乐"); + } + map.put("list",list); + return Result.OK("反馈成功"); + } + + + //根据订单标识修改订单祝福语背景 + @Override + public Result updateOrderBlessing(String token,String orderId,String giveTitle,String giveImage){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonOrder byId = commonOrderService.getById(orderId); + //订单不能为空 + if(byId==null){ + return Result.error("订单不存在"); + } + //不能为空 + if(giveImage==null||giveTitle==null){ + return Result.error("参数错误"); + } + byId.setGiveImage(giveImage); + byId.setGiveTitle(giveTitle); + commonOrderService.updateById(byId); + return Result.OK("修改成功"); + } + + + + + //1.收礼流程 =》点击收礼 + @Override + public Result getGiveShop(String token,String orderId,String name,String phone,String address,String addressDetails){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //查询订单是否存在 + CommonOrder commonOrder = commonOrderService.getById(orderId); + if (commonOrder==null){ + return Result.error("订单不存在"); + } + //得到送礼人数 + int memberNum = commonOrder.getMemberNum(); + //查询礼品订单是否领取完成 + List list = commonordergiveService.lambdaQuery().eq(Commonordergive::getOrderId, orderId).list(); + //送礼人数大于已领取人数 + if (memberNum>list.size()){ + //创建送收礼记录 + Commonordergive commonordergive = new Commonordergive(); + commonordergive.setOrderId(orderId); + commonordergive.setUserId(hanHaiMember.getId()); + commonordergive.setTitle(commonOrder.getGiveTitle()); + commonordergive.setImage(commonOrder.getGiveImage()); + commonordergive.setName(commonOrder.getName()); + commonordergive.setPhone(commonOrder.getPhone()); + commonordergive.setAddress(commonOrder.getAddress()); + commonordergive.setAddressDetails(commonOrder.getAddressDetails()); + commonordergive.setType(1); //收礼 + commonordergive.setState(1); //已领取 + commonordergive.setCreateTime(new Date()); + commonordergiveService.save(commonordergive); + + + //创建送礼记录 + Commonordergive commonordergive1 = new Commonordergive(); + commonordergive1.setOrderId(orderId); + commonordergive1.setUserId(commonOrder.getUserId()); + commonordergive1.setTitle(commonOrder.getTitle()); + commonordergive.setImage(commonOrder.getGiveImage()); + commonordergive.setName(commonOrder.getName()); + commonordergive.setPhone(commonOrder.getPhone()); + commonordergive.setAddress(commonOrder.getAddress()); + commonordergive.setAddressDetails(commonOrder.getAddressDetails()); + commonordergive.setType(0); //送礼 + commonordergive.setState(1); //已领取 + commonordergive.setCreateTime(new Date()); + + commonordergiveService.save(commonordergive1); + return Result.OK("领取成功"); + }else{ + return Result.error("已领取完成"); + } + } + + //2.点击抽奖 =》抽奖 + @Override + public Result getGiveShopLottery(String token,String orderId,String name,String phone,String address,String addressDetails){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //查询订单是否存在 + CommonOrder commonOrder = commonOrderService.getById(orderId); + if (commonOrder==null){ + return Result.error("订单不存在"); + } + //得到送礼人数 + int memberNum = commonOrder.getMemberNum(); + //查询礼品订单是否领取完成 + List list = commonordergiveService.lambdaQuery().eq(Commonordergive::getOrderId, orderId).list(); + //送礼人数大于已领取人数 + if (memberNum>list.size()){ + //创建送收礼记录 + Commonordergive commonordergive = new Commonordergive(); + commonordergive.setOrderId(orderId); + commonordergive.setUserId(hanHaiMember.getId()); + commonordergive.setTitle(commonOrder.getGiveTitle()); + commonordergive.setImage(commonOrder.getGiveImage()); + commonordergive.setName(commonOrder.getName()); + commonordergive.setPhone(commonOrder.getPhone()); + commonordergive.setAddress(commonOrder.getAddress()); + commonordergive.setAddressDetails(commonOrder.getAddressDetails()); + commonordergive.setType(1); //收礼 + commonordergive.setState(1); //已领取 + commonordergive.setCreateTime(new Date()); + commonordergiveService.save(commonordergive); + + + //创建送礼记录 + Commonordergive commonordergive1 = new Commonordergive(); + commonordergive1.setOrderId(orderId); + commonordergive1.setUserId(commonOrder.getUserId()); + commonordergive1.setTitle(commonOrder.getTitle()); + commonordergive.setImage(commonOrder.getGiveImage()); + commonordergive.setName(commonOrder.getName()); + commonordergive.setPhone(commonOrder.getPhone()); + commonordergive.setAddress(commonOrder.getAddress()); + commonordergive.setAddressDetails(commonOrder.getAddressDetails()); + commonordergive.setType(0); //送礼 + commonordergive.setState(1); //已领取 + commonordergive.setCreateTime(new Date()); + + commonordergiveService.save(commonordergive1); + return Result.OK("领取成功"); + }else{ + return Result.error("很遗憾，您没有领取到"); + } + } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java index 9b4def9..491d203 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-01-20 + * @Date: 2025-02-23 * @Version: V1.0 */ @Api(tags="订单信息表") 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 fdc6b1f..0fbbe07 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 @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.catalina.LifecycleState; import org.jeecg.modules.commonOrderSku.entity.CommonOrderSku; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; @@ -24,7 +25,7 @@ import lombok.experimental.Accessors; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-01-20 + * @Date: 2025-02-23 * @Version: V1.0 */ @Data @@ -51,6 +52,11 @@ public class CommonOrder implements Serializable { /**更新日期*/ @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; + /**送礼订单*/ + @Excel(name = "送礼订单", width = 15, dicCode = "give_state") + @Dict(dicCode = "give_state") + @ApiModelProperty(value = "送礼订单") + private java.lang.Integer isGive; /**标题*/ @Excel(name = "标题", width = 15) @ApiModelProperty(value = "标题") @@ -152,6 +158,22 @@ public class CommonOrder implements Serializable { @Excel(name = "优惠价格", width = 15) @ApiModelProperty(value = "优惠价格") private java.math.BigDecimal couponPrice; + /**送礼人数*/ + @Excel(name = "送礼人数", width = 15) + @ApiModelProperty(value = "送礼人数") + private java.lang.Integer memberNum; + /**送礼背景*/ + @Excel(name = "送礼背景", width = 15) + @ApiModelProperty(value = "送礼背景") + private java.lang.String giveImage; + /**送礼祝福语*/ + @Excel(name = "送礼祝福语", width = 15) + @ApiModelProperty(value = "送礼祝福语") + private java.lang.String giveTitle; + /**抽奖总次数*/ + @Excel(name = "抽奖总次数", width = 15) + @ApiModelProperty(value = "抽奖总次数") + private java.lang.Integer giveNum; @TableField(exist = false) private List commonOrderSkuList; diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java index 081090d..fb12e7e 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-01-20 + * @Date: 2025-02-23 * @Version: V1.0 */ public interface CommonOrderMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java index d553567..188a138 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-01-20 + * @Date: 2025-02-23 * @Version: V1.0 */ public interface ICommonOrderService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java index 21f1089..96ad6f3 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-01-20 + * @Date: 2025-02-23 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue index d973b3b..3e18f03 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue @@ -4,6 +4,11 @@
+ + + + + @@ -143,6 +148,11 @@ sorter: true, dataIndex: 'createTime' }, + { + title:'送礼订单', + align:"center", + dataIndex: 'isGive_dictText' + }, { title:'标题', align:"center", @@ -263,6 +273,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'datetime',value:'createTime',text:'创建日期'}) + fieldList.push({type:'int',value:'isGive',text:'送礼订单',dictCode:'give_state'}) fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'int',value:'state',text:'支付状态',dictCode:'order_state'}) fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''}) diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue index 7d4f3e9..9058b47 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue @@ -3,6 +3,11 @@ + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts index 303733f..2e037a1 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts @@ -10,6 +10,11 @@ export const columns: BasicColumn[] = [ sorter: true, dataIndex: 'createTime' }, + { + title: '送礼订单', + align:"center", + dataIndex: 'isGive_dictText' + }, { title: '标题', align:"center", @@ -99,6 +104,15 @@ export const columns: BasicColumn[] = [ //查询数据 export const searchFormSchema: FormSchema[] = [ { + label: "送礼订单", + field: "isGive", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"give_state" + }, + colProps: {span: 6}, + }, + { label: "支付状态", field: "state", component: 'JDictSelectTag', @@ -110,6 +124,14 @@ export const searchFormSchema: FormSchema[] = [ ]; //表单数据 export const formSchema: FormSchema[] = [ + { + label: '送礼订单', + field: 'isGive', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"give_state" + }, + }, { label: '标题', field: 'title', diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderImage/controller/CommonOrderImageController.java b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/controller/CommonOrderImageController.java new file mode 100644 index 0000000..07c0e01 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/controller/CommonOrderImageController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.commonOrderImage.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.commonOrderImage.entity.CommonOrderImage; +import org.jeecg.modules.commonOrderImage.service.ICommonOrderImageService; + +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: 2025-02-23 + * @Version: V1.0 + */ +@Api(tags="送礼背景设置") +@RestController +@RequestMapping("/commonOrderImage/commonOrderImage") +@Slf4j +public class CommonOrderImageController extends JeecgController { + @Autowired + private ICommonOrderImageService commonOrderImageService; + + /** + * 分页列表查询 + * + * @param commonOrderImage + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "送礼背景设置-分页列表查询") + @ApiOperation(value="送礼背景设置-分页列表查询", notes="送礼背景设置-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CommonOrderImage commonOrderImage, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonOrderImage, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonOrderImageService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param commonOrderImage + * @return + */ + @AutoLog(value = "送礼背景设置-添加") + @ApiOperation(value="送礼背景设置-添加", notes="送礼背景设置-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CommonOrderImage commonOrderImage) { + commonOrderImageService.save(commonOrderImage); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param commonOrderImage + * @return + */ + @AutoLog(value = "送礼背景设置-编辑") + @ApiOperation(value="送礼背景设置-编辑", notes="送礼背景设置-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CommonOrderImage commonOrderImage) { + commonOrderImageService.updateById(commonOrderImage); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "送礼背景设置-通过id删除") + @ApiOperation(value="送礼背景设置-通过id删除", notes="送礼背景设置-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + commonOrderImageService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "送礼背景设置-批量删除") + @ApiOperation(value="送礼背景设置-批量删除", notes="送礼背景设置-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.commonOrderImageService.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 queryById(@RequestParam(name="id",required=true) String id) { + CommonOrderImage commonOrderImage = commonOrderImageService.getById(id); + if(commonOrderImage==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(commonOrderImage); + } + + /** + * 导出excel + * + * @param request + * @param commonOrderImage + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CommonOrderImage commonOrderImage) { + return super.exportXls(request, commonOrderImage, CommonOrderImage.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, CommonOrderImage.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/entity/PopularizeRecruitLog.java b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/entity/CommonOrderImage.java similarity index 62% rename from module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/entity/PopularizeRecruitLog.java rename to module-common/src/main/java/org/jeecg/modules/commonOrderImage/entity/CommonOrderImage.java index 9b3a851..4e06462 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/entity/PopularizeRecruitLog.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/entity/CommonOrderImage.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.popularizeRecruitLog.entity; +package org.jeecg.modules.commonOrderImage.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -18,17 +18,17 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: 招募报名日志 + * @Description: 送礼背景设置 * @Author: jeecg-boot - * @Date: 2025-01-06 + * @Date: 2025-02-23 * @Version: V1.0 */ @Data -@TableName("popularize_recruit_log") +@TableName("common_order_image") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="popularize_recruit_log对象", description="招募报名日志") -public class PopularizeRecruitLog implements Serializable { +@ApiModel(value="common_order_image对象", description="送礼背景设置") +public class CommonOrderImage implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ @@ -47,20 +47,12 @@ public class PopularizeRecruitLog implements Serializable { /**更新日期*/ @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**用户信息*/ - @Excel(name = "用户信息", width = 15) - @ApiModelProperty(value = "用户信息") - private java.lang.String userId; - /**姓名*/ - @Excel(name = "姓名", width = 15) - @ApiModelProperty(value = "姓名") - private java.lang.String name; - /**电话*/ - @Excel(name = "电话", width = 15) - @ApiModelProperty(value = "电话") - private java.lang.String phone; - /**头像*/ - @Excel(name = "头像", width = 15) - @ApiModelProperty(value = "头像") - private java.lang.String headImage; + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + /**图片*/ + @Excel(name = "图片", width = 15) + @ApiModelProperty(value = "图片") + private java.lang.String image; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderImage/mapper/CommonOrderImageMapper.java b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/mapper/CommonOrderImageMapper.java new file mode 100644 index 0000000..324648d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/mapper/CommonOrderImageMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonOrderImage.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonOrderImage.entity.CommonOrderImage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 送礼背景设置 + * @Author: jeecg-boot + * @Date: 2025-02-23 + * @Version: V1.0 + */ +public interface CommonOrderImageMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/xml/PopularizeRecruitLogMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/mapper/xml/CommonOrderImageMapper.xml similarity index 58% rename from module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/xml/PopularizeRecruitLogMapper.xml rename to module-common/src/main/java/org/jeecg/modules/commonOrderImage/mapper/xml/CommonOrderImageMapper.xml index 6157b58..90e157e 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/xml/PopularizeRecruitLogMapper.xml +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/mapper/xml/CommonOrderImageMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderImage/service/ICommonOrderImageService.java b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/service/ICommonOrderImageService.java new file mode 100644 index 0000000..c05cf98 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/service/ICommonOrderImageService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.commonOrderImage.service; + +import org.jeecg.modules.commonOrderImage.entity.CommonOrderImage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 送礼背景设置 + * @Author: jeecg-boot + * @Date: 2025-02-23 + * @Version: V1.0 + */ +public interface ICommonOrderImageService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderImage/service/impl/CommonOrderImageServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/service/impl/CommonOrderImageServiceImpl.java new file mode 100644 index 0000000..13c9135 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/service/impl/CommonOrderImageServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.commonOrderImage.service.impl; + +import org.jeecg.modules.commonOrderImage.entity.CommonOrderImage; +import org.jeecg.modules.commonOrderImage.mapper.CommonOrderImageMapper; +import org.jeecg.modules.commonOrderImage.service.ICommonOrderImageService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 送礼背景设置 + * @Author: jeecg-boot + * @Date: 2025-02-23 + * @Version: V1.0 + */ +@Service +public class CommonOrderImageServiceImpl extends ServiceImpl implements ICommonOrderImageService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/PopularizeRecruitLogList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/CommonOrderImageList.vue similarity index 77% rename from module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/PopularizeRecruitLogList.vue rename to module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/CommonOrderImageList.vue index c321b40..88a7478 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/PopularizeRecruitLogList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/CommonOrderImageList.vue @@ -12,7 +12,7 @@
新增 - 导出 + 导出 导入 @@ -89,7 +89,7 @@
- + @@ -98,17 +98,17 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import PopularizeRecruitLogModal from './modules/PopularizeRecruitLogModal' + import CommonOrderImageModal from './modules/CommonOrderImageModal' export default { - name: 'PopularizeRecruitLogList', + name: 'CommonOrderImageList', mixins:[JeecgListMixin, mixinDevice], components: { - PopularizeRecruitLogModal + CommonOrderImageModal }, data () { return { - description: '招募报名日志管理页面', + description: '送礼背景设置管理页面', // 表头 columns: [ { @@ -122,24 +122,15 @@ } }, { - title:'用户信息', + title:'标题', align:"center", - dataIndex: 'userId' + dataIndex: 'title' }, { - title:'姓名', + title:'图片', align:"center", - dataIndex: 'name' - }, - { - title:'电话', - align:"center", - dataIndex: 'phone' - }, - { - title:'头像', - align:"center", - dataIndex: 'headImage' + dataIndex: 'image', + scopedSlots: {customRender: 'imgSlot'} }, { title: '操作', @@ -151,11 +142,11 @@ } ], url: { - list: "/popularizeRecruitLog/popularizeRecruitLog/list", - delete: "/popularizeRecruitLog/popularizeRecruitLog/delete", - deleteBatch: "/popularizeRecruitLog/popularizeRecruitLog/deleteBatch", - exportXlsUrl: "/popularizeRecruitLog/popularizeRecruitLog/exportXls", - importExcelUrl: "popularizeRecruitLog/popularizeRecruitLog/importExcel", + list: "/commonOrderImage/commonOrderImage/list", + delete: "/commonOrderImage/commonOrderImage/delete", + deleteBatch: "/commonOrderImage/commonOrderImage/deleteBatch", + exportXlsUrl: "/commonOrderImage/commonOrderImage/exportXls", + importExcelUrl: "commonOrderImage/commonOrderImage/importExcel", }, dictOptions:{}, @@ -175,10 +166,8 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'userId',text:'用户信息',dictCode:''}) - fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''}) - fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''}) - fieldList.push({type:'Text',value:'headImage',text:'头像',dictCode:''}) + fieldList.push({type:'Text',value:'title',text:'标题',dictCode:''}) + fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) this.superFieldList = fieldList } } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogForm.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/modules/CommonOrderImageForm.vue similarity index 65% rename from module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogForm.vue rename to module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/modules/CommonOrderImageForm.vue index 27366ec..5247e85 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/modules/CommonOrderImageForm.vue @@ -4,23 +4,13 @@ - - + + - - - - - - - - - - - - + + @@ -35,7 +25,7 @@ import { validateDuplicateValue } from '@/utils/util' export default { - name: 'PopularizeRecruitLogForm', + name: 'CommonOrderImageForm', components: { }, props: { @@ -62,9 +52,9 @@ validatorRules: { }, url: { - add: "/popularizeRecruitLog/popularizeRecruitLog/add", - edit: "/popularizeRecruitLog/popularizeRecruitLog/edit", - queryById: "/popularizeRecruitLog/popularizeRecruitLog/queryById" + add: "/commonOrderImage/commonOrderImage/add", + edit: "/commonOrderImage/commonOrderImage/edit", + queryById: "/commonOrderImage/commonOrderImage/queryById" } } }, diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/modules/CommonOrderImageModal.Style#Drawer.vue similarity index 85% rename from module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.Style#Drawer.vue rename to module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/modules/CommonOrderImageModal.Style#Drawer.vue index f30bf45..c8fea75 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.Style#Drawer.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/modules/CommonOrderImageModal.Style#Drawer.vue @@ -7,7 +7,7 @@ @close="close" destroyOnClose :visible="visible"> - +
关闭 提交 @@ -17,12 +17,12 @@ + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleForm.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleForm.vue new file mode 100644 index 0000000..25655df --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleForm.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleModal.Style#Drawer.vue new file mode 100644 index 0000000..723496d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleModal.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleModal.vue new file mode 100644 index 0000000..1a62fbc --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitle.api.ts b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitle.api.ts new file mode 100644 index 0000000..c187085 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitle.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/commonOrderTitle/commonOrderTitle/list', + save='/commonOrderTitle/commonOrderTitle/add', + edit='/commonOrderTitle/commonOrderTitle/edit', + deleteOne = '/commonOrderTitle/commonOrderTitle/delete', + deleteBatch = '/commonOrderTitle/commonOrderTitle/deleteBatch', + importExcel = '/commonOrderTitle/commonOrderTitle/importExcel', + exportXls = '/commonOrderTitle/commonOrderTitle/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}); +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitle.data.ts b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitle.data.ts new file mode 100644 index 0000000..29329a6 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitle.data.ts @@ -0,0 +1,23 @@ +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: 'title' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '祝福语', + field: 'title', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitleList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitleList.vue new file mode 100644 index 0000000..d699e3c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitleList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/components/CommonOrderTitleModal.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/components/CommonOrderTitleModal.vue new file mode 100644 index 0000000..3519526 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/components/CommonOrderTitleModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..66076ce --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/controller/CommonordergiveController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.commonordergive.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.commonordergive.entity.Commonordergive; +import org.jeecg.modules.commonordergive.service.ICommonordergiveService; + +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: 2025-02-23 + * @Version: V1.0 + */ +@Api(tags="礼品订单") +@RestController +@RequestMapping("/commonordergive/commonordergive") +@Slf4j +public class CommonordergiveController extends JeecgController { + @Autowired + private ICommonordergiveService commonordergiveService; + + /** + * 分页列表查询 + * + * @param commonordergive + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "礼品订单-分页列表查询") + @ApiOperation(value="礼品订单-分页列表查询", notes="礼品订单-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(Commonordergive commonordergive, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonordergive, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonordergiveService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param commonordergive + * @return + */ + @AutoLog(value = "礼品订单-添加") + @ApiOperation(value="礼品订单-添加", notes="礼品订单-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody Commonordergive commonordergive) { + commonordergiveService.save(commonordergive); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param commonordergive + * @return + */ + @AutoLog(value = "礼品订单-编辑") + @ApiOperation(value="礼品订单-编辑", notes="礼品订单-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody Commonordergive commonordergive) { + commonordergiveService.updateById(commonordergive); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "礼品订单-通过id删除") + @ApiOperation(value="礼品订单-通过id删除", notes="礼品订单-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + commonordergiveService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "礼品订单-批量删除") + @ApiOperation(value="礼品订单-批量删除", notes="礼品订单-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.commonordergiveService.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 queryById(@RequestParam(name="id",required=true) String id) { + Commonordergive commonordergive = commonordergiveService.getById(id); + if(commonordergive==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(commonordergive); + } + + /** + * 导出excel + * + * @param request + * @param commonordergive + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Commonordergive commonordergive) { + return super.exportXls(request, commonordergive, Commonordergive.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, Commonordergive.class); + } + +} 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 new file mode 100644 index 0000000..0d80ff7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/entity/Commonordergive.java @@ -0,0 +1,94 @@ +package org.jeecg.modules.commonordergive.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: 2025-02-23 + * @Version: V1.0 + */ +@Data +@TableName("commonordergive") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="commonordergive对象", description="礼品订单") +public class Commonordergive 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.Integer type; + /**礼品类型*/ + @Excel(name = "礼品类型", width = 15) + @ApiModelProperty(value = "礼品类型") + private java.lang.Integer isGive; + /**礼品标题*/ + @Excel(name = "礼品标题", width = 15) + @ApiModelProperty(value = "礼品标题") + private java.lang.String title; + /**礼品图片*/ + @Excel(name = "礼品图片", width = 15) + @ApiModelProperty(value = "礼品图片") + private java.lang.String image; + /**关联商品*/ + @Excel(name = "关联商品", width = 15) + @ApiModelProperty(value = "关联商品") + private java.lang.String orderId; + /**收货人*/ + @Excel(name = "收货人", width = 15) + @ApiModelProperty(value = "收货人") + private java.lang.String name; + /**联系电话*/ + @Excel(name = "联系电话", width = 15) + @ApiModelProperty(value = "联系电话") + private java.lang.String phone; + /**所在地区*/ + @Excel(name = "所在地区", width = 15) + @ApiModelProperty(value = "所在地区") + private java.lang.String address; + /**详细地址*/ + @Excel(name = "详细地址", width = 15) + @ApiModelProperty(value = "详细地址") + private java.lang.String addressDetails; + /**领取状态*/ + @Excel(name = "领取状态", width = 15) + @ApiModelProperty(value = "领取状态") + private java.lang.Integer state; + /**领取用户*/ + @Excel(name = "领取用户", width = 15) + @ApiModelProperty(value = "领取用户") + private java.lang.String userId; +} 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 new file mode 100644 index 0000000..b0871d1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/CommonordergiveMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonordergive.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonordergive.entity.Commonordergive; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 礼品订单 + * @Author: jeecg-boot + * @Date: 2025-02-23 + * @Version: V1.0 + */ +public interface CommonordergiveMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/xml/CommonordergiveMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/xml/CommonordergiveMapper.xml new file mode 100644 index 0000000..477e9f7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/xml/CommonordergiveMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..ff79b23 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/service/ICommonordergiveService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.commonordergive.service; + +import org.jeecg.modules.commonordergive.entity.Commonordergive; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 礼品订单 + * @Author: jeecg-boot + * @Date: 2025-02-23 + * @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 new file mode 100644 index 0000000..cf37642 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/service/impl/CommonordergiveServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.commonordergive.service.impl; + +import org.jeecg.modules.commonordergive.entity.Commonordergive; +import org.jeecg.modules.commonordergive.mapper.CommonordergiveMapper; +import org.jeecg.modules.commonordergive.service.ICommonordergiveService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 礼品订单 + * @Author: jeecg-boot + * @Date: 2025-02-23 + * @Version: V1.0 + */ +@Service +public class CommonordergiveServiceImpl extends ServiceImpl implements ICommonordergiveService { + +} 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 new file mode 100644 index 0000000..3752d43 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/CommonordergiveList.vue @@ -0,0 +1,231 @@ + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..02665dc --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveForm.vue @@ -0,0 +1,154 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveModal.Style#Drawer.vue new file mode 100644 index 0000000..8346024 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveModal.vue b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveModal.vue new file mode 100644 index 0000000..9016e7e --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.api.ts b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.api.ts new file mode 100644 index 0000000..5eda527 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/commonordergive/commonordergive/list', + save='/commonordergive/commonordergive/add', + edit='/commonordergive/commonordergive/edit', + deleteOne = '/commonordergive/commonordergive/delete', + deleteBatch = '/commonordergive/commonordergive/deleteBatch', + importExcel = '/commonordergive/commonordergive/importExcel', + exportXls = '/commonordergive/commonordergive/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}); +} 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 new file mode 100644 index 0000000..a20e826 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.data.ts @@ -0,0 +1,123 @@ +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: 'type' + }, + { + title: '礼品类型', + align:"center", + dataIndex: 'isGive' + }, + { + title: '礼品标题', + align:"center", + dataIndex: 'title' + }, + { + title: '礼品图片', + align:"center", + dataIndex: 'image' + }, + { + title: '关联商品', + align:"center", + dataIndex: 'orderId' + }, + { + title: '收货人', + align:"center", + dataIndex: 'name' + }, + { + title: '联系电话', + align:"center", + dataIndex: 'phone' + }, + { + title: '所在地区', + align:"center", + dataIndex: 'address' + }, + { + title: '详细地址', + align:"center", + dataIndex: 'addressDetails' + }, + { + title: '领取状态', + align:"center", + dataIndex: 'state' + }, + { + title: '领取用户', + align:"center", + dataIndex: 'userId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '类型', + field: 'type', + component: 'InputNumber', + }, + { + label: '礼品类型', + field: 'isGive', + component: 'InputNumber', + }, + { + label: '礼品标题', + field: 'title', + component: 'Input', + }, + { + label: '礼品图片', + field: 'image', + component: 'Input', + }, + { + label: '关联商品', + field: 'orderId', + component: 'Input', + }, + { + label: '收货人', + field: 'name', + component: 'Input', + }, + { + label: '联系电话', + field: 'phone', + component: 'Input', + }, + { + label: '所在地区', + field: 'address', + component: 'Input', + }, + { + label: '详细地址', + field: 'addressDetails', + component: 'Input', + }, + { + label: '领取状态', + field: 'state', + component: 'InputNumber', + }, + { + label: '领取用户', + field: 'userId', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/CommonordergiveList.vue b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/CommonordergiveList.vue new file mode 100644 index 0000000..c05e890 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/CommonordergiveList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/components/CommonordergiveModal.vue b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/components/CommonordergiveModal.vue new file mode 100644 index 0000000..e19345d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/components/CommonordergiveModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/PopularizeRecruitLogMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/PopularizeRecruitLogMapper.java deleted file mode 100644 index b7e7644..0000000 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/PopularizeRecruitLogMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.popularizeRecruitLog.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 招募报名日志 - * @Author: jeecg-boot - * @Date: 2025-01-06 - * @Version: V1.0 - */ -public interface PopularizeRecruitLogMapper extends BaseMapper { - -} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/IPopularizeRecruitLogService.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/IPopularizeRecruitLogService.java deleted file mode 100644 index d1c16bb..0000000 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/IPopularizeRecruitLogService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.popularizeRecruitLog.service; - -import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 招募报名日志 - * @Author: jeecg-boot - * @Date: 2025-01-06 - * @Version: V1.0 - */ -public interface IPopularizeRecruitLogService extends IService { - -} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/impl/PopularizeRecruitLogServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/impl/PopularizeRecruitLogServiceImpl.java deleted file mode 100644 index 9b53f4a..0000000 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/impl/PopularizeRecruitLogServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.popularizeRecruitLog.service.impl; - -import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog; -import org.jeecg.modules.popularizeRecruitLog.mapper.PopularizeRecruitLogMapper; -import org.jeecg.modules.popularizeRecruitLog.service.IPopularizeRecruitLogService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 招募报名日志 - * @Author: jeecg-boot - * @Date: 2025-01-06 - * @Version: V1.0 - */ -@Service -public class PopularizeRecruitLogServiceImpl extends ServiceImpl implements IPopularizeRecruitLogService { - -} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.data.ts deleted file mode 100644 index 836a840..0000000 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.data.ts +++ /dev/null @@ -1,53 +0,0 @@ -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: 'userId' - }, - { - title: '姓名', - align:"center", - dataIndex: 'name' - }, - { - title: '电话', - align:"center", - dataIndex: 'phone' - }, - { - title: '头像', - align:"center", - dataIndex: 'headImage' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '用户信息', - field: 'userId', - component: 'Input', - }, - { - label: '姓名', - field: 'name', - component: 'Input', - }, - { - label: '电话', - field: 'phone', - component: 'Input', - }, - { - label: '头像', - field: 'headImage', - component: 'Input', - }, -];