From 9044d98de782f6f47580d4da1450db63344bc2c5 Mon Sep 17 00:00:00 2001 From: lzx_mac <2602107437@qq.com> Date: Fri, 6 Dec 2024 01:20:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E7=B1=B3=E6=8F=90=E4=BA=A4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applet-rice-api/applet-rice-api.iml | 37 +- applet-rice-api/pom.xml | 6 + .../api/controller/ApiRiceIndexController.java | 96 +++- .../api/controller/ApiRiceInfoController.java | 88 +++- .../java/org/jeecg/api/service/ApiRiceService.java | 54 ++- .../jeecg/api/service/impl/ApiRiceServiceImpl.java | 500 +++++++++++++++++++-- .../controller/CommonAddressController.java | 2 +- .../commonAddress/entity/CommonAddress.java | 4 +- .../commonAddress/mapper/CommonAddressMapper.java | 2 +- .../service/ICommonAddressService.java | 2 +- .../service/impl/CommonAddressServiceImpl.java | 2 +- .../commonAddress/vue/CommonAddressList.vue | 6 +- .../vue/modules/CommonAddressForm.vue | 2 +- .../commonAddress/vue3/CommonAddress.data.ts | 2 +- .../commonCat/controller/CommonCatController.java | 2 +- .../jeecg/modules/commonCat/entity/CommonCat.java | 6 +- .../modules/commonCat/mapper/CommonCatMapper.java | 2 +- .../commonCat/service/ICommonCatService.java | 2 +- .../service/impl/CommonCatServiceImpl.java | 2 +- .../jeecg/modules/commonCat/vue/CommonCatList.vue | 6 + .../commonCat/vue/modules/CommonCatForm.vue | 5 + .../jeecg/modules/commonCat/vue3/CommonCat.data.ts | 10 + .../modules/commonOrder/entity/CommonOrder.java | 22 +- .../modules/commonOrder/vue/CommonOrderList.vue | 20 +- .../commonOrder/vue/modules/CommonOrderForm.vue | 17 +- .../modules/commonOrder/vue3/CommonOrder.data.ts | 32 +- .../controller/CommonOrderSkuController.java | 171 +++++++ .../commonOrderSku/entity/CommonOrderSku.java | 89 ++++ .../mapper/CommonOrderSkuMapper.java | 17 + .../mapper/xml/CommonOrderSkuMapper.xml | 5 + .../service/ICommonOrderSkuService.java | 14 + .../service/impl/CommonOrderSkuServiceImpl.java | 19 + .../commonOrderSku/vue/CommonOrderSkuList.vue | 219 +++++++++ .../vue/modules/CommonOrderSkuForm.vue | 144 ++++++ .../modules/CommonOrderSkuModal.Style#Drawer.vue | 84 ++++ .../vue/modules/CommonOrderSkuModal.vue | 60 +++ .../commonOrderSku/vue3/CommonOrderSku.api.ts | 61 +++ .../commonOrderSku/vue3/CommonOrderSku.data.ts | 103 +++++ .../commonOrderSku/vue3/CommonOrderSkuList.vue | 162 +++++++ .../vue3/components/CommonOrderSkuModal.vue | 58 +++ .../controller/CommonShopController.java | 2 +- .../modules/commonShop/entity/CommonShop.java | 6 +- .../commonShop/mapper/CommonShopMapper.java | 2 +- .../commonShop/service/ICommonShopService.java | 2 +- .../service/impl/CommonShopServiceImpl.java | 2 +- .../modules/commonShop/vue/CommonShopList.vue | 6 + .../commonShop/vue/modules/CommonShopForm.vue | 5 + .../modules/commonShop/vue3/CommonShop.data.ts | 10 + .../src/main/resources/application-dev.yml | 4 +- .../src/main/resources/pay_weixin.properties | 10 +- 50 files changed, 2067 insertions(+), 117 deletions(-) create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/controller/CommonOrderSkuController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/CommonOrderSkuMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/xml/CommonOrderSkuMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/ICommonOrderSkuService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/impl/CommonOrderSkuServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/CommonOrderSkuList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSkuList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/components/CommonOrderSkuModal.vue diff --git a/applet-rice-api/applet-rice-api.iml b/applet-rice-api/applet-rice-api.iml index ba4da20..abca61b 100644 --- a/applet-rice-api/applet-rice-api.iml +++ b/applet-rice-api/applet-rice-api.iml @@ -60,7 +60,6 @@ - @@ -204,7 +203,6 @@ - @@ -220,16 +218,9 @@ - - - - - - - @@ -244,6 +235,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/applet-rice-api/pom.xml b/applet-rice-api/pom.xml index 079597d..52d3be0 100644 --- a/applet-rice-api/pom.xml +++ b/applet-rice-api/pom.xml @@ -42,6 +42,12 @@ 3.2.0 compile + + org.jeecgframework.boot + module-pay + 3.2.0 + compile + diff --git a/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceIndexController.java b/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceIndexController.java index 9e01921..29ff1f2 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceIndexController.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceIndexController.java @@ -7,9 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.api.service.ApiRiceService; import org.jeecg.bean.PageBean; import org.jeecg.common.api.vo.Result; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -104,22 +102,44 @@ public class ApiRiceIndexController { } - //创建订单 - @ApiOperation(value="创建订单", notes="创建订单") - @GetMapping(value = "/createOrder") - public Result createOrder(String token,String productId,Integer num) { - return apiRiceService.createOrder(token,productId,num); - } + + + + + + + + + + + + + //加入购物车 传入token productId num @ApiOperation(value="加入购物车 传入token productId num", notes="加入购物车 传入token productId num") @GetMapping(value = "/addCart") - public Result addCart(String token,String productId,Integer num){ - return apiRiceService.addCart(token,productId,num); + public Result addCart(@RequestHeader("X-Access-Token") String token,String shopId,Integer num){ + return apiRiceService.addCart(token,shopId,num); + } + + + //删除购物车信息 + @ApiOperation(value="删除购物车信息", notes="删除购物车信息") + @DeleteMapping(value = "/deleteCart") + public Result deleteCart(@RequestHeader("X-Access-Token") String token,String id){ + return apiRiceService.deleteCart(token,id); } + //修改购物车信息数量 + @ApiOperation(value="修改购物车信息数量", notes="修改购物车信息数量") + @PostMapping(value = "/updateCartNum") + public Result updateCartNum(@RequestHeader("X-Access-Token") String token,String id,Integer num){ + return apiRiceService.updateCartNum(token,id,num); + } + //查询分类接口 @@ -135,4 +155,58 @@ public class ApiRiceIndexController { + + //创建订单 + @ApiOperation(value="创建订单", notes="创建订单") + @GetMapping(value = "/createOrder") + public Result createOrder(@RequestHeader("X-Access-Token") String token, String productId, Integer num,String addressId) { + return apiRiceService.createOrder(token,productId,num,addressId); + } + + + + //商城-加入购物车之后一次下多个订单 + @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 list,String addressId,String orderId){ + return apiRiceService.createSumOrderAgain(token,list,addressId,orderId); + } + + + + + + @PostMapping("/payNotify") + public Object payNotify(@RequestBody String requestBody){ + return apiRiceService.payNotify(requestBody); + } + + + + + + + + + + + + + + + + + + + + } diff --git a/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java b/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java index 74c4487..b0bfc96 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java @@ -8,11 +8,10 @@ import org.jeecg.api.service.ApiRiceService; import org.jeecg.bean.PageBean; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.commonAddress.entity.CommonAddress; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.math.BigDecimal; @Api(tags="三只青蛙-个人") @RestController @@ -27,43 +26,59 @@ public class ApiRiceInfoController { //获取流水记录带分页 @ApiOperation(value="获取流水记录带分页", notes="获取流水记录带分页") @GetMapping(value = "/getWaterPageList") - public Result getWaterPageList(){ - return apiRiceService.getWaterPageList(); + public Result getWaterPageList(@RequestHeader("X-Access-Token") String token,PageBean pageBean){ + return apiRiceService.getWaterPageList(token,pageBean); } //获取订单列表带分页 @ApiOperation(value="获取订单列表带分页", notes="获取订单列表带分页") @GetMapping(value = "/getOrderPageList") - public Result getOrderPageList(){ - return apiRiceService.getOrderPageList(); + public Result getOrderPageList(@RequestHeader("X-Access-Token") String token, PageBean pageBean,Integer state){ + return apiRiceService.getOrderPageList(token,pageBean,state); } + + + //获取订单详情 + @ApiOperation(value="获取订单详情", notes="获取订单详情") + @GetMapping(value = "/getOrderDetail") + public Result getOrderDetail(@RequestHeader("X-Access-Token") String token,String id){ + return apiRiceService.getOrderDetail(token,id); + } + + + + + + + + //获取地址列表带分页 @ApiOperation(value="获取地址列表带分页", notes="获取地址列表带分页") @GetMapping(value = "/getAddressPageList") - public Result getAddressPageList(){ - return apiRiceService.getAddressPageList(); + public Result getAddressPageList(@RequestHeader("X-Access-Token") String token,PageBean pageBean){ + return apiRiceService.getAddressPageList(token,pageBean); } //获取粉丝列表带分页 @ApiOperation(value="获取粉丝列表带分页", notes="获取粉丝列表带分页") @GetMapping(value = "/getFansPageList") - public Result getFansPageList(){ - return apiRiceService.getFansPageList(); + public Result getFansPageList(@RequestHeader("X-Access-Token") String token,PageBean pageBean){ + return apiRiceService.getFansPageList(token,pageBean); } //获取个人邀请码 @ApiOperation(value="获取个人邀请码", notes="获取个人邀请码") @GetMapping(value = "/getInviteCode") - public Result getInviteCode(){ - return apiRiceService.getInviteCode(); + public Result getInviteCode(@RequestHeader("X-Access-Token") String token){ + return apiRiceService.getInviteCode(token); } //获取购物车信息列表带分页 @ApiOperation(value="获取购物车信息列表带分页", notes="获取购物车信息列表带分页") @GetMapping(value = "/getCartPageList") - public Result getCartPageList(PageBean pageBean){ - return apiRiceService.getCartPageList(pageBean); + public Result getCartPageList(@RequestHeader("X-Access-Token") String token,PageBean pageBean){ + return apiRiceService.getCartPageList(token,pageBean); } @@ -84,11 +99,30 @@ public class ApiRiceInfoController { //增加或修改地址信息 @ApiOperation(value="增加或修改地址信息", notes="增加或修改地址信息") - @GetMapping(value = "/addOrUpdateAddress") - public Result addOrUpdateAddress(CommonAddress commonAddress){ - return apiRiceService.addOrUpdateAddress(commonAddress); + @PostMapping(value = "/addOrUpdateAddress") + public Result addOrUpdateAddress(@RequestHeader("X-Access-Token") String token,CommonAddress commonAddress){ + return apiRiceService.addOrUpdateAddress(token,commonAddress); + } + + + + //删除地址 + @ApiOperation(value="删除地址", notes="删除地址") + @GetMapping(value = "/deleteAddress") + public Result deleteAddress(@RequestHeader("X-Access-Token") String token,String id){ + return apiRiceService.deleteAddress(token,id); + } + + + //修改默认地址 + @ApiOperation(value="修改默认地址", notes="修改默认地址") + @GetMapping(value = "/updateDefaultAddress") + public Result updateDefaultAddress(@RequestHeader("X-Access-Token") String token,String id){ + return apiRiceService.updateDefaultAddress(token,id); } + + //查询个人信息相关 @ApiOperation(value="查询个人信息相关", notes="查询个人信息相关") @GetMapping(value = "/getRiceInfo") @@ -98,5 +132,23 @@ public class ApiRiceInfoController { + //充值 + @ApiOperation(value="充值", notes="充值") + @GetMapping(value = "/recharge") + public Result recharge(@RequestHeader("X-Access-Token") String token, BigDecimal money){ + return apiRiceService.recharge(token,money); + } + + + + + + //提现 + @ApiOperation(value="提现", notes="提现") + @GetMapping(value = "/withdraw") + public Result withdraw(@RequestHeader("X-Access-Token") String token,BigDecimal money){ + return apiRiceService.withdraw(token,money); + } + } diff --git a/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java b/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java index 90d9f0d..a2842bf 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java @@ -5,6 +5,9 @@ import org.jeecg.bean.PageBean; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.commonAddress.entity.CommonAddress; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestHeader; + +import java.math.BigDecimal; public interface ApiRiceService { @@ -43,11 +46,28 @@ public interface ApiRiceService { //创建订单 - Result createOrder(String token,String productId,Integer num); + Result createOrder(String token,String productId,Integer num,String addressId); + + + //商城-立即购买多少商品 + Result createSumOrder(String token,String list,String addressId); + + //商城-加入购物车之后一次下多个订单 - 再次下单 + Result createSumOrderAgain(String token,String list,String addressId,String orderId); + + + //商城-支付回调 + Object payNotify(String requestBody); //加入购物车 - Result addCart(String token,String productId,Integer num); + Result addCart(String token,String shopId,Integer num); + + //删除购物车信息 + Result deleteCart(String token,String id); + + //修改购物车信息数量 + Result updateCartNum(String token,String id,Integer num); Result getClassShopPageList(PageBean pageBean,String classId); @@ -61,22 +81,25 @@ public interface ApiRiceService { Result applyRiceVip(String token); //获取流水记录带分页 - Result getWaterPageList(); + Result getWaterPageList(String token,PageBean pageBean); //获取订单列表带分页 - Result getOrderPageList(); + Result getOrderPageList(String token, PageBean pageBean,Integer state); + + //获取订单详情 + Result getOrderDetail(String token, String id); //获取粉丝列表带分页 - Result getFansPageList(); + Result getFansPageList(String token,PageBean pageBean); //获取购物车信息列表带分页 - Result getCartPageList(PageBean pageBean); + Result getCartPageList(String token,PageBean pageBean); //获取地址列表带分页 - Result getAddressPageList(); + Result getAddressPageList(String token,PageBean pageBean); //获取个人邀请码 - Result getInviteCode(); + Result getInviteCode(String token); //获取相关介绍 Result getInfoIntroduce(String type); @@ -85,10 +108,23 @@ public interface ApiRiceService { Result getCategoryList(); //增加或者修改地址 - Result addOrUpdateAddress(CommonAddress commonAddress); + Result addOrUpdateAddress(String token,CommonAddress commonAddress); + + //删除地址 + Result deleteAddress(String token,String id); + + //修改默认地址 + Result updateDefaultAddress(String token,String id); //查询个人信息相关 Result getRiceInfo(String token); + + //充值 + Result recharge(String token, BigDecimal money); + + //提现 + Result withdraw(String token,BigDecimal money); + } diff --git a/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java b/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java index 0afbe0c..608188a 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java @@ -1,10 +1,18 @@ package org.jeecg.api.service.impl; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; +import lombok.extern.log4j.Log4j; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.jeecg.api.service.ApiRiceService; import org.jeecg.bean.PageBean; 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.entity.CommonBanner; @@ -16,6 +24,7 @@ import org.jeecg.modules.commonClass.service.ICommonClassService; import org.jeecg.modules.commonConfig.service.ICommonConfigService; import org.jeecg.modules.commonIconImage.entity.CommonIconImage; import org.jeecg.modules.commonIconImage.service.ICommonIconImageService; +import org.jeecg.modules.commonMoney.entity.CommonMoney; import org.jeecg.modules.commonMoney.service.ICommonMoneyService; import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog; import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService; @@ -25,23 +34,27 @@ 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.commonOrderSku.entity.CommonOrderSku; +import org.jeecg.modules.commonOrderSku.service.ICommonOrderSkuService; import org.jeecg.modules.commonShop.entity.CommonShop; import org.jeecg.modules.commonShop.service.ICommonShopService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.pay.MpWxPayService; import org.jeecg.modules.riceNews.entity.RiceNews; import org.jeecg.modules.riceNews.service.IRiceNewsService; import org.jeecg.modules.riceVip.entity.RiceVip; import org.jeecg.modules.riceVip.service.IRiceVipService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestHeader; import javax.annotation.Resource; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.math.BigDecimal; +import java.util.*; + +@Slf4j @Service public class ApiRiceServiceImpl implements ApiRiceService { @@ -69,6 +82,8 @@ public class ApiRiceServiceImpl implements ApiRiceService { @Resource private ICommonOrderService commonOrderService; @Resource + private ICommonOrderSkuService commonOrderSkuService; + @Resource private ICommonShopService commonShopService; @Resource private IRiceVipService riceVipService; @@ -76,6 +91,12 @@ public class ApiRiceServiceImpl implements ApiRiceService { private IHanHaiMemberService hanHaiMemberService; @Resource private IRiceNewsService riceNewsService; + //权限配置 + @Resource + private ShiroRealm shiroRealm; + //支付接口 + @Autowired + private MpWxPayService mpWxPayService; @@ -138,6 +159,7 @@ public class ApiRiceServiceImpl implements ApiRiceService { IPage pageList = commonShopService.lambdaQuery() .eq(CommonShop::getClassId,classId) + .eq(CommonShop::getType,2) .orderByDesc(CommonShop::getCreateTime) .page(page); return Result.OK(pageList); @@ -185,61 +207,344 @@ public class ApiRiceServiceImpl implements ApiRiceService { //创建订单 @Override - public Result createOrder(String token,String productId,Integer num) { + public Result createOrder(String token,String productId,Integer num,String addressId) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //商品标识不能为空 + if (productId==null){ + return Result.error("商品标识不能为空"); + } + //数量不能为空 + if (num==null){ + return Result.error("数量不能为空"); + } + //查询商品信息 CommonShop commonShop = commonShopService.getById(productId); + //商品不能为空 if (commonShop==null){ return Result.error("商品不存在"); } + //地址标识不能为空 + if (addressId==null){ + return Result.error("地址标识不能为空"); + } + //查询地址是否存在 + CommonAddress commonAddress = commonAddressService.getById(addressId); + if (commonAddress==null){ + return Result.error("地址不存在"); + } + //创建订单标识 + String orderId = IdWorker.getIdStr(); + //创建订单 + BigDecimal price = commonShop.getPrice().multiply(new BigDecimal(num)); + //生成订单信息 CommonOrder commonOrder = new CommonOrder(); + + commonOrder.setId(orderId); commonOrder.setTitle(commonShop.getTitle()); + commonOrder.setShopId(commonShop.getId()); commonOrder.setImage(commonShop.getImage()); - commonOrder.setCreateTime(new Date()); - commonOrder.setState("0"); - + commonOrder.setState(1); + commonOrder.setPrice(price); + commonOrder.setNum(num); + commonOrder.setSku(commonShop.getSku()); + commonOrder.setName(commonAddress.getName()); + commonOrder.setPhone(commonAddress.getPhone()); + commonOrder.setAddress(commonAddress.getAddress()); + commonOrder.setAddressDetails(commonAddress.getAddressDetails()); + commonOrder.setUserId(hanHaiMember.getId()); + commonOrder.setAddressId(addressId); commonOrderService.save(commonOrder); + //创建订单详情 + CommonOrderSku commonOrderSku = new CommonOrderSku(); + commonOrderSku.setOrderId(orderId); + commonOrderSku.setShopId(commonShop.getId()); + commonOrderSku.setTitle(commonShop.getTitle()); + commonOrderSku.setImage(commonShop.getImage()); + commonOrderSku.setPrice(price); + commonOrderSku.setNum(num); + commonOrderSku.setSku(commonShop.getSku()); + commonOrderSku.setCreateTime(new Date()); + commonOrderSkuService.save(commonOrderSku); + + //吊起微信支付 + String s = price.multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + Object appOrder = mpWxPayService.createOrder( + "购买"+ commonShop.getTitle() , + "127.0.0.1", + orderId, + i1, + orderId, + hanHaiMember.getAppletOpenid(), + commonOrder.toString()); + + return Result.OK("支付成功",appOrder); + } + - //生成流水数据 - CommonMoneyLog commonMoneyLog = new CommonMoneyLog(); - commonMoneyLog.setCreateTime(new Date()); - commonMoneyLog.setTitle("测试收入"); - commonMoneyLog.setMoney(commonShop.getPrice()); - commonMoneyLog.setType(1); - commonMoneyLogService.save(commonMoneyLog); + //商城-立即购买多少商品 + @Override + public Result createSumOrder(String token,String list,String addressId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //用户地址不能为空 + if(StringUtils.isBlank(addressId)){ + return Result.error("请选择收货地址"); + } + //查询地址是否存在 + CommonAddress commonAddress = commonAddressService.getById(addressId); + if (commonAddress==null){ + return Result.error("地址不存在"); + } + //把list转为对象 list = [{"shopId":"1","num":1},{"shopId":"2","num":2}] + List list1 = JSON.parseArray(list, CommonOrderSku.class); + //创建订单标识 + String orderId = IdWorker.getIdStr(); + if(null!=list1 && list1.size()>0){ + //订单总额 + BigDecimal totalPrice = new BigDecimal(0); + //订单商品数量 + Integer totalNum = 0; + + //创建订单详情 + for (CommonOrderSku sku : list1) { + //查询商品信息 + CommonShop commonShop = commonShopService.getById(sku.getShopId()); + //商品不能为空 + if (commonShop==null){ + return Result.error("商品不存在"); + } + //创建订单 + BigDecimal price = commonShop.getPrice().multiply(new BigDecimal(sku.getNum())); + + sku.setOrderId(orderId); + sku.setShopId(commonShop.getId()); + sku.setTitle(commonShop.getTitle()); + sku.setImage(commonShop.getImage()); + sku.setPrice(price); + sku.setNum(sku.getNum()); + sku.setSku(commonShop.getSku()); + sku.setCreateTime(new Date()); + sku.setPrice(price); + + sku.setImage(commonShop.getImage()); + sku.setCreateTime(new Date()); + sku.setOrderId(orderId); + commonOrderSkuService.save(sku); + + //计算总价格 + totalPrice = totalPrice.add(price); + + totalNum = totalNum + sku.getNum(); + } + + + //创建主订单 + CommonOrder cityOrder = new CommonOrder(); + cityOrder.setId(orderId); + cityOrder.setUserId(hanHaiMember.getId()); + cityOrder.setShopId(null); + cityOrder.setNum(totalNum); + cityOrder.setAddress(commonAddress.getAddress()); + cityOrder.setName(commonAddress.getName()); + cityOrder.setPhone(commonAddress.getPhone()); + cityOrder.setAddressDetails(commonAddress.getAddressDetails()); + cityOrder.setName("店铺订单"); + cityOrder.setPrice(totalPrice); + + cityOrder.setImage(null); + cityOrder.setState(0); + cityOrder.setCreateTime(new Date()); + + commonOrderService.save(cityOrder); + + //吊起微信支付 + String s = totalPrice.multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + Object appOrder = mpWxPayService.createOrder( + "购买"+ "店铺订单" , + "127.0.0.1", + orderId, + i1, + orderId, + hanHaiMember.getAppletOpenid(), + cityOrder.toString()); + + return Result.OK("支付成功",appOrder); + } + return null; + } - CommonMoneyLog commonMoneyLog2 = new CommonMoneyLog(); - commonMoneyLog2.setCreateTime(new Date()); - commonMoneyLog2.setTitle("测试支出"); - commonMoneyLog2.setMoney(commonShop.getPrice()); - commonMoneyLog2.setType(0); - commonMoneyLogService.save(commonMoneyLog); + //商城-加入购物车之后一次下多个订单 - 再次下单 + @Override + public Result createSumOrderAgain(String token,String list,String addressId,String order){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //根据订单标识查询订单是否存在 + CommonOrder commonOrder = commonOrderService.getById(order); + if (commonOrder==null){ + return Result.error("订单不存在"); + } + //根据订单标识查询订单详情列表 + List commonOrderSkuList = commonOrderSkuService.lambdaQuery() + .eq(CommonOrderSku::getOrderId,order) + .list(); + if (commonOrderSkuList==null || commonOrderSkuList.size()==0){ + return Result.error("订单详情不存在"); + } + //如果集合存在循环删除 + commonOrderSkuService.remove(new QueryWrapper().eq("order_id",order)); - return Result.OK("创建成功"); + //用户地址不能为空 + if(StringUtils.isBlank(addressId)){ + return Result.error("请选择收货地址"); + } + //查询地址是否存在 + CommonAddress commonAddress = commonAddressService.getById(addressId); + if (commonAddress==null){ + return Result.error("地址不存在"); + } + //把list转为对象 list = [{"shopId":"1","num":1},{"shopId":"2","num":2}] + List list1 = JSON.parseArray(list, CommonOrderSku.class); + //创建订单标识 + String orderId = IdWorker.getIdStr(); + if(null!=list1 && list1.size()>0){ + //订单总额 + BigDecimal totalPrice = new BigDecimal(0); + //订单商品数量 + Integer totalNum = 0; + + //创建订单详情 + for (CommonOrderSku sku : list1) { + //查询商品信息 + CommonShop commonShop = commonShopService.getById(sku.getShopId()); + //商品不能为空 + if (commonShop==null){ + return Result.error("商品不存在"); + } + //创建订单 + BigDecimal price = commonShop.getPrice().multiply(new BigDecimal(sku.getNum())); + + sku.setOrderId(orderId); + sku.setShopId(commonShop.getId()); + sku.setTitle(commonShop.getTitle()); + sku.setImage(commonShop.getImage()); + sku.setPrice(price); + sku.setNum(sku.getNum()); + sku.setSku(commonShop.getSku()); + sku.setCreateTime(new Date()); + sku.setPrice(price); + + sku.setImage(commonShop.getImage()); + sku.setCreateTime(new Date()); + sku.setOrderId(orderId); + commonOrderSkuService.save(sku); + + //计算总价格 + totalPrice = totalPrice.add(price); + + totalNum = totalNum + sku.getNum(); + } + + + //创建主订单 + CommonOrder cityOrder = new CommonOrder(); + cityOrder.setId(orderId); + cityOrder.setUserId(hanHaiMember.getId()); + cityOrder.setShopId(null); + cityOrder.setNum(totalNum); + cityOrder.setAddress(commonAddress.getAddress()); + cityOrder.setName(commonAddress.getName()); + cityOrder.setPhone(commonAddress.getPhone()); + cityOrder.setAddressDetails(commonAddress.getAddressDetails()); + cityOrder.setName("店铺订单"); + cityOrder.setPrice(totalPrice); + + cityOrder.setImage(null); + cityOrder.setState(0); + cityOrder.setCreateTime(new Date()); + + commonOrderService.save(cityOrder); + + //吊起微信支付 + String s = totalPrice.multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + Object appOrder = mpWxPayService.createOrder( + "购买"+ "店铺订单" , + "127.0.0.1", + orderId, + i1, + orderId, + hanHaiMember.getAppletOpenid(), + cityOrder.toString()); + + return Result.OK("支付成功",appOrder); + } + return null; } + //商城-支付回调 + @Override + public Result payNotify(String requestBody){ + WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody); + String outTradeNo = notify.getOutTradeNo(); + log.info("支付回调订单号码："+outTradeNo); + //查询订单信息 + CommonOrder commonOrder = commonOrderService.getById(outTradeNo); + //如果订单存在则修改订单状态 + if (commonOrder!=null){ + commonOrder.setState(1); + commonOrderService.updateById(commonOrder); + } + + return null; + } + //加入购物车 @Override - public Result addCart(String token,String productId,Integer num){ + public Result addCart(String token,String shopId,Integer num){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //根据商品标识查询商品信息 - CommonShop commonShop = commonShopService.getById(productId); + CommonShop commonShop = commonShopService.getById(shopId); if (commonShop==null){ return Result.error("商品不存在"); } - CommonCat commonCat = new CommonCat(); commonCat.setTitle(commonShop.getTitle()); + commonCat.setShopId(commonShop.getId()); commonCat.setImage(commonShop.getImage()); + commonCat.setSku(commonShop.getSku()); + commonCat.setPrice(commonShop.getPrice()); + commonCat.setUserId(hanHaiMember.getId()); commonCat.setNum(num); commonCat.setCreateTime(new Date()); commonCatService.save(commonCat); return Result.OK("加入成功"); } + //删除购物车信息 + @Override + public Result deleteCart(String token,String id){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + commonCatService.removeById(id); + return Result.OK("删除成功"); + } + + + //修改购物车信息数量 + @Override + public Result updateCartNum(String token,String id,Integer num){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonCat commonCat = commonCatService.getById(id); + commonCat.setNum(num); + commonCatService.updateById(commonCat); + return Result.OK("修改成功"); + } + //获取会员权益信息列表 @Override public Result getRiceVipList(){ @@ -251,47 +556,109 @@ public class ApiRiceServiceImpl implements ApiRiceService { //申请成为会员 @Override public Result applyRiceVip(String token){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); return null; } //获取流水记录带分页 @Override - public Result getWaterPageList(){ - Page page = commonMoneyLogService.page(new Page<>(1, 10)); + public Result getWaterPageList(String token,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = commonMoneyLogService.lambdaQuery() + .orderByDesc(CommonMoneyLog::getCreateTime) + .page(new Page<>(1, 10)); return Result.OK(page); } //获取订单列表带分页 @Override - public Result getOrderPageList(){ - Page page = commonOrderService.page(new Page<>(1, 10)); - return Result.OK(page); + public Result getOrderPageList(String token, PageBean bean,Integer state){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(bean.getPageNo(), bean.getPageSize()); + Page page1 = commonOrderService.lambdaQuery() + .eq(CommonOrder::getUserId,hanHaiMember.getId()) + .orderByDesc(CommonOrder::getCreateTime) + .page(page); + //如果订单状态不为空 + if(null!=state){ + page1 = commonOrderService.lambdaQuery() + .eq(CommonOrder::getUserId,hanHaiMember.getId()) + .eq(CommonOrder::getState,state) + .orderByDesc(CommonOrder::getCreateTime) + .page(page); + } + //拿出订单集合 + List records = page1.getRecords(); + //创建新集合 + List newRecords = new ArrayList<>(); + for (CommonOrder cityOrder : records) { + //根据订单id查询订单详情 + List commonOrderSkuList = commonOrderSkuService.lambdaQuery() + .eq(CommonOrderSku::getOrderId,cityOrder.getId()) + .list(); + cityOrder.setCommonOrderSkuList(commonOrderSkuList); + newRecords.add(cityOrder); + } + page1.setRecords(newRecords); + return Result.OK(page1); + } + + + //获取订单详情 + @Override + public Result getOrderDetail(@RequestHeader("X-Access-Token") String token, String id){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonOrder cityOrder = commonOrderService.getById(id); + //根据订单id查询订单详情 + List commonOrderSkuList = commonOrderSkuService.lambdaQuery() + .eq(CommonOrderSku::getOrderId,cityOrder.getId()) + .list(); + cityOrder.setCommonOrderSkuList(commonOrderSkuList); + return Result.OK(cityOrder); } + + + + + + //获取粉丝列表带分页 @Override - public Result getFansPageList(){ - Page page = hanHaiMemberService.page(new Page<>(1, 10)); + public Result getFansPageList(String token,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = hanHaiMemberService + .lambdaQuery() + .eq(HanHaiMember::getShareId,hanHaiMember.getId()) + .page(new Page<>(1, 10)); return Result.OK(page); } //获取购物车信息列表带分页 @Override - public Result getCartPageList(PageBean pageBean){ - Page page = commonCatService.page(new Page<>(1, 10)); + public Result getCartPageList(String token,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = commonCatService + .lambdaQuery() + .eq(CommonCat::getUserId,hanHaiMember.getId()) + .page(new Page<>(1, 10)); return Result.OK(page); } //获取地址列表带分页 @Override - public Result getAddressPageList(){ - Page page = commonAddressService.page(new Page<>(1, 10)); + public Result getAddressPageList(String token,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = commonAddressService + .lambdaQuery() + .eq(CommonAddress::getUserId,hanHaiMember.getId()) + .page(new Page<>(1, 10)); return Result.OK(page); } //获取个人邀请码 @Override - public Result getInviteCode(){ + public Result getInviteCode(String token){ return null; } @@ -316,12 +683,44 @@ public class ApiRiceServiceImpl implements ApiRiceService { //增加或者修改地址 @Override - public Result addOrUpdateAddress(CommonAddress commonAddress){ + public Result addOrUpdateAddress(String token,CommonAddress commonAddress){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); commonAddressService.saveOrUpdate(commonAddress); return Result.OK("增加成功"); } + //删除地址 + @Override + public Result deleteAddress(String token,String id){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + commonAddressService.removeById(id); + return Result.OK("删除成功"); + } + + //修改默认地址 + @Override + public Result updateDefaultAddress(String token,String id){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //查询是否有默认地址 + List list = commonAddressService.lambdaQuery() + .eq(CommonAddress::getDefaultFlag,1) + .list(); + //如果有全部改为不默认 + if (list!=null && list.size()>0){ + for (CommonAddress commonAddress : list) { + commonAddress.setDefaultFlag(0); + commonAddressService.updateById(commonAddress); + } + } + //查询当前这个地址信息 + CommonAddress commonAddress = commonAddressService.getById(id); + commonAddress.setDefaultFlag(1); + commonAddressService.updateById(commonAddress); + + return Result.OK("修改成功"); + } + //查询个人信息相关 @Override public Result getRiceInfo(String token){ @@ -336,4 +735,29 @@ public class ApiRiceServiceImpl implements ApiRiceService { map.put("memberNum",10); return Result.OK(map); } + + + + //充值 + @Override + public Result recharge(String token,BigDecimal money){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //查询当前用户余额 + CommonMoney commonMoney = commonMoneyService.lambdaQuery() + .eq(CommonMoney::getUserId,hanHaiMember.getId()) + .one(); + + return Result.OK("充值成功"); + } + + //提现 + @Override + public Result withdraw(String token,BigDecimal money){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //查询当前用户余额 + CommonMoney commonMoney = commonMoneyService.lambdaQuery() + .eq(CommonMoney::getUserId,hanHaiMember.getId()) + .one(); + return Result.OK("提现成功"); + } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonAddress/controller/CommonAddressController.java b/module-common/src/main/java/org/jeecg/modules/commonAddress/controller/CommonAddressController.java index 7c8a4c0..8524a65 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonAddress/controller/CommonAddressController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonAddress/controller/CommonAddressController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 地址信息表 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-05 * @Version: V1.0 */ @Api(tags="地址信息表") diff --git a/module-common/src/main/java/org/jeecg/modules/commonAddress/entity/CommonAddress.java b/module-common/src/main/java/org/jeecg/modules/commonAddress/entity/CommonAddress.java index f279882..aea49fe 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonAddress/entity/CommonAddress.java +++ b/module-common/src/main/java/org/jeecg/modules/commonAddress/entity/CommonAddress.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 地址信息表 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-05 * @Version: V1.0 */ @Data @@ -66,7 +66,7 @@ public class CommonAddress implements Serializable { /**默认*/ @Excel(name = "默认", width = 15) @ApiModelProperty(value = "默认") - private java.lang.String defaultFlag; + private java.lang.Integer defaultFlag; /**用户*/ @Excel(name = "用户", width = 15) @ApiModelProperty(value = "用户") diff --git a/module-common/src/main/java/org/jeecg/modules/commonAddress/mapper/CommonAddressMapper.java b/module-common/src/main/java/org/jeecg/modules/commonAddress/mapper/CommonAddressMapper.java index 4266f6a..aee8923 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonAddress/mapper/CommonAddressMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonAddress/mapper/CommonAddressMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 地址信息表 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-05 * @Version: V1.0 */ public interface CommonAddressMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonAddress/service/ICommonAddressService.java b/module-common/src/main/java/org/jeecg/modules/commonAddress/service/ICommonAddressService.java index 92ec910..34adc5e 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonAddress/service/ICommonAddressService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonAddress/service/ICommonAddressService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 地址信息表 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-05 * @Version: V1.0 */ public interface ICommonAddressService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonAddress/service/impl/CommonAddressServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonAddress/service/impl/CommonAddressServiceImpl.java index af290f7..4da9d93 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonAddress/service/impl/CommonAddressServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonAddress/service/impl/CommonAddressServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 地址信息表 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-05 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/commonAddress/vue/CommonAddressList.vue b/module-common/src/main/java/org/jeecg/modules/commonAddress/vue/CommonAddressList.vue index 608c985..72d6f32 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonAddress/vue/CommonAddressList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonAddress/vue/CommonAddressList.vue @@ -195,11 +195,11 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'address',text:'地址',dictCode:''}) - fieldList.push({type:'string',value:'addressDetails',text:'详细',dictCode:''}) + fieldList.push({type:'Text',value:'address',text:'地址',dictCode:''}) + fieldList.push({type:'Text',value:'addressDetails',text:'详细',dictCode:''}) fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''}) - fieldList.push({type:'string',value:'defaultFlag',text:'默认',dictCode:''}) + fieldList.push({type:'int',value:'defaultFlag',text:'默认',dictCode:''}) fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''}) fieldList.push({type:'string',value:'longitude',text:'纬度',dictCode:''}) fieldList.push({type:'string',value:'latitude',text:'经度',dictCode:''}) diff --git a/module-common/src/main/java/org/jeecg/modules/commonAddress/vue/modules/CommonAddressForm.vue b/module-common/src/main/java/org/jeecg/modules/commonAddress/vue/modules/CommonAddressForm.vue index 7b72456..5c3d548 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonAddress/vue/modules/CommonAddressForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonAddress/vue/modules/CommonAddressForm.vue @@ -25,7 +25,7 @@ - + diff --git a/module-common/src/main/java/org/jeecg/modules/commonAddress/vue3/CommonAddress.data.ts b/module-common/src/main/java/org/jeecg/modules/commonAddress/vue3/CommonAddress.data.ts index 65d0112..def2eb6 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonAddress/vue3/CommonAddress.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonAddress/vue3/CommonAddress.data.ts @@ -73,7 +73,7 @@ export const formSchema: FormSchema[] = [ { label: '默认', field: 'defaultFlag', - component: 'Input', + component: 'InputNumber', }, { label: '用户', diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/controller/CommonCatController.java b/module-common/src/main/java/org/jeecg/modules/commonCat/controller/CommonCatController.java index 6d4bb1e..1dec84d 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonCat/controller/CommonCatController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/controller/CommonCatController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 购物车信息表 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-05 * @Version: V1.0 */ @Api(tags="购物车信息表") diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/entity/CommonCat.java b/module-common/src/main/java/org/jeecg/modules/commonCat/entity/CommonCat.java index 27a52d0..1ae0180 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonCat/entity/CommonCat.java +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/entity/CommonCat.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 购物车信息表 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-05 * @Version: V1.0 */ @Data @@ -71,4 +71,8 @@ public class CommonCat implements Serializable { @Excel(name = "价格", width = 15) @ApiModelProperty(value = "价格") private java.math.BigDecimal price; + /**商品标识*/ + @Excel(name = "商品标识", width = 15) + @ApiModelProperty(value = "商品标识") + private java.lang.String shopId; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/mapper/CommonCatMapper.java b/module-common/src/main/java/org/jeecg/modules/commonCat/mapper/CommonCatMapper.java index d940e49..a9a57ec 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonCat/mapper/CommonCatMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/mapper/CommonCatMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 购物车信息表 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-05 * @Version: V1.0 */ public interface CommonCatMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/service/ICommonCatService.java b/module-common/src/main/java/org/jeecg/modules/commonCat/service/ICommonCatService.java index 7055dcb..b30e2b5 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonCat/service/ICommonCatService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/service/ICommonCatService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 购物车信息表 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-05 * @Version: V1.0 */ public interface ICommonCatService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/service/impl/CommonCatServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonCat/service/impl/CommonCatServiceImpl.java index a9df1b7..09b5f68 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonCat/service/impl/CommonCatServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/service/impl/CommonCatServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 购物车信息表 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-05 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue/CommonCatList.vue b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/CommonCatList.vue index e34232e..9ea1b29 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonCat/vue/CommonCatList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/CommonCatList.vue @@ -151,6 +151,11 @@ align:"center", dataIndex: 'price' }, + { + title:'商品标识', + align:"center", + dataIndex: 'shopId' + }, { title: '操作', dataIndex: 'action', @@ -191,6 +196,7 @@ fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''}) fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''}) fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''}) + fieldList.push({type:'string',value:'shopId',text:'商品标识',dictCode:''}) this.superFieldList = fieldList } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatForm.vue b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatForm.vue index fde8571..d0f73a5 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatForm.vue @@ -33,6 +33,11 @@ + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.data.ts b/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.data.ts index afd344d..5b50220 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.data.ts @@ -34,6 +34,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'price' }, + { + title: '商品标识', + align:"center", + dataIndex: 'shopId' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -70,4 +75,9 @@ export const formSchema: FormSchema[] = [ field: 'price', component: 'InputNumber', }, + { + label: '商品标识', + field: 'shopId', + component: 'Input', + }, ]; 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 3dbac45..5724eef 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 @@ -4,11 +4,15 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.modules.commonOrderSku.entity.CommonOrderSku; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; @@ -58,7 +62,7 @@ public class CommonOrder implements Serializable { /**支付状态*/ @Excel(name = "支付状态", width = 15) @ApiModelProperty(value = "支付状态") - private java.lang.String state; + private java.lang.Integer state; /**价格*/ @Excel(name = "价格", width = 15) @ApiModelProperty(value = "价格") @@ -91,4 +95,20 @@ public class CommonOrder implements Serializable { @Excel(name = "用户", width = 15) @ApiModelProperty(value = "用户") private java.lang.String userId; + /**地址标识*/ + @Excel(name = "地址标识", width = 15) + @ApiModelProperty(value = "地址标识") + private java.lang.String addressId; + /**商品标识*/ + @Excel(name = "商品标识", width = 15) + @ApiModelProperty(value = "商品标识") + private java.lang.String shopId; + /**支付编号*/ + @Excel(name = "支付编号", width = 15) + @ApiModelProperty(value = "支付编号") + private java.lang.String payNo; + + + @TableField(exist = false) + private List commonOrderSkuList; } 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 38370ec..e3144f6 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 @@ -176,6 +176,21 @@ align:"center", dataIndex: 'userId' }, + { + title:'地址标识', + align:"center", + dataIndex: 'addressId' + }, + { + title:'商品标识', + align:"center", + dataIndex: 'shopId' + }, + { + title:'支付编号', + align:"center", + dataIndex: 'payNo' + }, { title: '操作', dataIndex: 'action', @@ -212,7 +227,7 @@ let fieldList=[]; fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) - fieldList.push({type:'string',value:'state',text:'支付状态',dictCode:''}) + fieldList.push({type:'int',value:'state',text:'支付状态',dictCode:''}) fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''}) fieldList.push({type:'int',value:'num',text:'数量',dictCode:''}) fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''}) @@ -221,6 +236,9 @@ fieldList.push({type:'string',value:'address',text:'地址',dictCode:''}) fieldList.push({type:'string',value:'addressDetails',text:'详细地址',dictCode:''}) fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''}) + fieldList.push({type:'string',value:'addressId',text:'地址标识',dictCode:''}) + fieldList.push({type:'string',value:'shopId',text:'商品标识',dictCode:''}) + fieldList.push({type:'string',value:'payNo',text:'支付编号',dictCode:''}) this.superFieldList = fieldList } } 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 870a7e3..9eb34ab 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 @@ -15,7 +15,7 @@ - + @@ -58,6 +58,21 @@ + + + + + + + + + + + + + + + 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 db9c83a..2ece5b0 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 @@ -59,6 +59,21 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'userId' }, + { + title: '地址标识', + align:"center", + dataIndex: 'addressId' + }, + { + title: '商品标识', + align:"center", + dataIndex: 'shopId' + }, + { + title: '支付编号', + align:"center", + dataIndex: 'payNo' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -78,7 +93,7 @@ export const formSchema: FormSchema[] = [ { label: '支付状态', field: 'state', - component: 'Input', + component: 'InputNumber', }, { label: '价格', @@ -120,4 +135,19 @@ export const formSchema: FormSchema[] = [ field: 'userId', component: 'Input', }, + { + label: '地址标识', + field: 'addressId', + component: 'Input', + }, + { + label: '商品标识', + field: 'shopId', + component: 'Input', + }, + { + label: '支付编号', + field: 'payNo', + component: 'Input', + }, ]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/controller/CommonOrderSkuController.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/controller/CommonOrderSkuController.java new file mode 100644 index 0000000..7ce5d5a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/controller/CommonOrderSkuController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.commonOrderSku.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.commonOrderSku.entity.CommonOrderSku; +import org.jeecg.modules.commonOrderSku.service.ICommonOrderSkuService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 订单详情表 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +@Api(tags="订单详情表") +@RestController +@RequestMapping("/commonOrderSku/commonOrderSku") +@Slf4j +public class CommonOrderSkuController extends JeecgController { + @Autowired + private ICommonOrderSkuService commonOrderSkuService; + + /** + * 分页列表查询 + * + * @param commonOrderSku + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "订单详情表-分页列表查询") + @ApiOperation(value="订单详情表-分页列表查询", notes="订单详情表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CommonOrderSku commonOrderSku, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonOrderSku, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonOrderSkuService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param commonOrderSku + * @return + */ + @AutoLog(value = "订单详情表-添加") + @ApiOperation(value="订单详情表-添加", notes="订单详情表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CommonOrderSku commonOrderSku) { + commonOrderSkuService.save(commonOrderSku); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param commonOrderSku + * @return + */ + @AutoLog(value = "订单详情表-编辑") + @ApiOperation(value="订单详情表-编辑", notes="订单详情表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CommonOrderSku commonOrderSku) { + commonOrderSkuService.updateById(commonOrderSku); + 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) { + commonOrderSkuService.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.commonOrderSkuService.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) { + CommonOrderSku commonOrderSku = commonOrderSkuService.getById(id); + if(commonOrderSku==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(commonOrderSku); + } + + /** + * 导出excel + * + * @param request + * @param commonOrderSku + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CommonOrderSku commonOrderSku) { + return super.exportXls(request, commonOrderSku, CommonOrderSku.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, CommonOrderSku.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java new file mode 100644 index 0000000..78acd0d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java @@ -0,0 +1,89 @@ +package org.jeecg.modules.commonOrderSku.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 订单详情表 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +@Data +@TableName("common_order_sku") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="common_order_sku对象", description="订单详情表") +public class CommonOrderSku 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; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**订单*/ + @Excel(name = "订单", width = 15) + @ApiModelProperty(value = "订单") + private java.lang.String orderId; + /**标题*/ + @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 state; + /**价格*/ + @Excel(name = "价格", width = 15) + @ApiModelProperty(value = "价格") + private java.math.BigDecimal price; + /**数量*/ + @Excel(name = "数量", width = 15) + @ApiModelProperty(value = "数量") + private java.lang.Integer num; + /**规格*/ + @Excel(name = "规格", width = 15) + @ApiModelProperty(value = "规格") + private java.lang.String sku; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private java.lang.String userId; + /**商品*/ + @Excel(name = "商品", width = 15) + @ApiModelProperty(value = "商品") + private java.lang.String shopId; +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/CommonOrderSkuMapper.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/CommonOrderSkuMapper.java new file mode 100644 index 0000000..72b09fe --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/CommonOrderSkuMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonOrderSku.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonOrderSku.entity.CommonOrderSku; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 订单详情表 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +public interface CommonOrderSkuMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/xml/CommonOrderSkuMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/xml/CommonOrderSkuMapper.xml new file mode 100644 index 0000000..239ed27 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/xml/CommonOrderSkuMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/ICommonOrderSkuService.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/ICommonOrderSkuService.java new file mode 100644 index 0000000..a6a6069 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/ICommonOrderSkuService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.commonOrderSku.service; + +import org.jeecg.modules.commonOrderSku.entity.CommonOrderSku; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 订单详情表 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +public interface ICommonOrderSkuService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/impl/CommonOrderSkuServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/impl/CommonOrderSkuServiceImpl.java new file mode 100644 index 0000000..338f703 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/impl/CommonOrderSkuServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.commonOrderSku.service.impl; + +import org.jeecg.modules.commonOrderSku.entity.CommonOrderSku; +import org.jeecg.modules.commonOrderSku.mapper.CommonOrderSkuMapper; +import org.jeecg.modules.commonOrderSku.service.ICommonOrderSkuService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 订单详情表 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +@Service +public class CommonOrderSkuServiceImpl extends ServiceImpl implements ICommonOrderSkuService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/CommonOrderSkuList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/CommonOrderSkuList.vue new file mode 100644 index 0000000..2b0f35f --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/CommonOrderSkuList.vue @@ -0,0 +1,219 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuForm.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuForm.vue new file mode 100644 index 0000000..c821cec --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuForm.vue @@ -0,0 +1,144 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuModal.Style#Drawer.vue new file mode 100644 index 0000000..0cdffa0 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuModal.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuModal.vue new file mode 100644 index 0000000..554a7b1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.api.ts b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.api.ts new file mode 100644 index 0000000..cbf9a63 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/commonOrderSku/commonOrderSku/list', + save='/commonOrderSku/commonOrderSku/add', + edit='/commonOrderSku/commonOrderSku/edit', + deleteOne = '/commonOrderSku/commonOrderSku/delete', + deleteBatch = '/commonOrderSku/commonOrderSku/deleteBatch', + importExcel = '/commonOrderSku/commonOrderSku/importExcel', + exportXls = '/commonOrderSku/commonOrderSku/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/commonOrderSku/vue3/CommonOrderSku.data.ts b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.data.ts new file mode 100644 index 0000000..e30b872 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.data.ts @@ -0,0 +1,103 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '订单', + align:"center", + dataIndex: 'orderId' + }, + { + title: '标题', + align:"center", + dataIndex: 'title' + }, + { + title: '图片', + align:"center", + dataIndex: 'image' + }, + { + title: '状态', + align:"center", + dataIndex: 'state' + }, + { + title: '价格', + align:"center", + dataIndex: 'price' + }, + { + title: '数量', + align:"center", + dataIndex: 'num' + }, + { + title: '规格', + align:"center", + dataIndex: 'sku' + }, + { + title: '用户', + align:"center", + dataIndex: 'userId' + }, + { + title: '商品', + align:"center", + dataIndex: 'shopId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '订单', + field: 'orderId', + component: 'Input', + }, + { + label: '标题', + field: 'title', + component: 'Input', + }, + { + label: '图片', + field: 'image', + component: 'Input', + }, + { + label: '状态', + field: 'state', + component: 'Input', + }, + { + label: '价格', + field: 'price', + component: 'InputNumber', + }, + { + label: '数量', + field: 'num', + component: 'InputNumber', + }, + { + label: '规格', + field: 'sku', + component: 'Input', + }, + { + label: '用户', + field: 'userId', + component: 'Input', + }, + { + label: '商品', + field: 'shopId', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSkuList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSkuList.vue new file mode 100644 index 0000000..1ec03bb --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSkuList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/components/CommonOrderSkuModal.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/components/CommonOrderSkuModal.vue new file mode 100644 index 0000000..556df82 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/components/CommonOrderSkuModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java b/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java index 9621087..20b2e83 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 单商户商品信息表 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-05 * @Version: V1.0 */ @Api(tags="单商户商品信息表") diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java index 550db6f..5a7e789 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 单商户商品信息表 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-05 * @Version: V1.0 */ @Data @@ -89,4 +89,8 @@ public class CommonShop implements Serializable { @Dict(dictTable = "common_class", dicText = "title", dicCode = "id") @ApiModelProperty(value = "分类标识") private java.lang.String classId; + /**会员价格*/ + @Excel(name = "会员价格", width = 15) + @ApiModelProperty(value = "会员价格") + private java.math.BigDecimal vipPrice; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java b/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java index f4d6c57..fb65c21 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 单商户商品信息表 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-05 * @Version: V1.0 */ public interface CommonShopMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java b/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java index 72e9306..6231b72 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 单商户商品信息表 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-05 * @Version: V1.0 */ public interface ICommonShopService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java index e955f75..e7b6f25 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 单商户商品信息表 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-05 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue index 9cbccfa..8107754 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue @@ -183,6 +183,11 @@ align:"center", dataIndex: 'classId_dictText' }, + { + title:'会员价格', + align:"center", + dataIndex: 'vipPrice' + }, { title: '操作', dataIndex: 'action', @@ -227,6 +232,7 @@ fieldList.push({type:'string',value:'skuIcon',text:'标签',dictCode:''}) fieldList.push({type:'Text',value:'details',text:'详情',dictCode:''}) fieldList.push({type:'sel_search',value:'classId',text:'分类标识',dictTable:"common_class", dictText:'title', dictCode:'id'}) + fieldList.push({type:'BigDecimal',value:'vipPrice',text:'会员价格',dictCode:''}) this.superFieldList = fieldList } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.vue b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.vue index 1e9d355..438b75d 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.vue @@ -53,6 +53,11 @@ + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/vue3/CommonShop.data.ts b/module-common/src/main/java/org/jeecg/modules/commonShop/vue3/CommonShop.data.ts index 5f2025e..4090ceb 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/vue3/CommonShop.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/vue3/CommonShop.data.ts @@ -50,6 +50,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'classId_dictText' }, + { + title: '会员价格', + align:"center", + dataIndex: 'vipPrice' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -123,4 +128,9 @@ export const formSchema: FormSchema[] = [ dict:"common_class,title,id" }, }, + { + label: '会员价格', + field: 'vipPrice', + component: 'InputNumber', + }, ]; diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml index 4dc492e..65bf432 100644 --- a/module-system/src/main/resources/application-dev.yml +++ b/module-system/src/main/resources/application-dev.yml @@ -343,8 +343,8 @@ third-app: wechat-dm: mpAppId: wx0839bc52e7849c13 mpAppSecret: c614fd865951c5246e849501204e6f7f - mchId: - mchKey: + mchId: 1700534180 + mchKey: 9bde2770a74c2a460592de2d451ce05f keyPath: notifyUrl: diff --git a/module-system/src/main/resources/pay_weixin.properties b/module-system/src/main/resources/pay_weixin.properties index f9fe890..6d5c2b9 100644 --- a/module-system/src/main/resources/pay_weixin.properties +++ b/module-system/src/main/resources/pay_weixin.properties @@ -1,8 +1,8 @@ -pay.mchId=1684003236 -pay.appId=wxe337e285c449abfc -pay.mchKey=0fdb77429ffdf206c151af76a663041c +pay.mchId=1700534180 +pay.appId=wx0839bc52e7849c13 +pay.mchKey=9bde2770a74c2a460592de2d451ce05f pay.keyPath=classpath:apiclient_cert.pem -pay.notifyUrl=http://h5.xzaiyp.top/cheer-admin/cheer/info/notify -pay.notifyUrlDev=http://h5.xzaiyp.top/cheer-admin/cheer/info/notify +pay.notifyUrl=http://h5.xzaiyp.top/rice-admin/rice_index/payNotify +pay.notifyUrlDev=http://h5.xzaiyp.top/rice-admin/rice_index/payNotify