From e3487d4c593ca6762ac2153ddc797fed601fdb3c Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Thu, 5 Jun 2025 10:41:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/AppletIndexController.java | 11 +- .../org/jeecg/api/service/AppletIndexService.java | 6 +- .../api/service/impl/AppletIndexServiceImpl.java | 34 ++-- .../api/service/impl/AppletOrderServiceImpl.java | 218 +++++++++++++++++++-- .../controller/CommonShopController.java | 2 +- .../modules/commonShop/entity/CommonShop.java | 7 +- .../commonShop/mapper/CommonShopMapper.java | 2 +- .../commonShop/service/ICommonShopService.java | 2 +- .../service/impl/CommonShopServiceImpl.java | 2 +- .../modules/commonShop/vue/CommonShopList.vue | 21 +- .../commonShop/vue/modules/CommonShopForm.vue | 5 + .../modules/commonShop/vue3/CommonShop.data.ts | 22 +++ 12 files changed, 288 insertions(+), 44 deletions(-) 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 dc91e77..d8aefcb 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 @@ -44,13 +44,20 @@ public class AppletIndexController { } + //获取城市 + @ApiOperation(value="获取城市", notes="获取城市") + @GetMapping("/getCity") + public Result getCity(){ + return appletIndexService.getCity(); + } + //获取建材商品信息列表 @ApiOperation(value="获取建材商品信息列表", notes="获取建材商品信息列表") @GetMapping("/getProductList") - public Result getProductList(String shopIconId, String shopClassId, PageBean pageBean){ - return appletIndexService.getProductList(shopIconId,shopClassId,pageBean); + public Result getProductList(String cityId,String shopIconId, String shopClassId, PageBean pageBean){ + return appletIndexService.getProductList(cityId,shopIconId,shopClassId,pageBean); } 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 ba5fbe3..7e9872f 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 @@ -20,8 +20,12 @@ public interface AppletIndexService { //获取分类 Result getClassify(); + + //获取城市 + Result getCity(); + //获取建材商品信息列表带分页搜索 - Result getProductList(String shopIconId,String shopClassId,PageBean pageBean); + Result getProductList(String cityId,String shopIconId,String shopClassId,PageBean pageBean); //获取商品信息详情 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 84e3500..7d3e0d2 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 @@ -2,6 +2,7 @@ package org.jeecg.api.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.jeecg.api.bean.PageBean; import org.jeecg.api.service.AppletIndexService; import org.jeecg.api.service.AppletInfoService; @@ -13,6 +14,7 @@ import org.jeecg.modules.commonAddress.entity.CommonAddress; import org.jeecg.modules.commonAddress.service.ICommonAddressService; import org.jeecg.modules.commonBanner.entity.CommonBanner; import org.jeecg.modules.commonBanner.service.ICommonBannerService; +import org.jeecg.modules.commonCity.service.ICommonCityService; import org.jeecg.modules.commonIconImage.entity.CommonIconImage; import org.jeecg.modules.commonIconImage.service.ICommonIconImageService; import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog; @@ -62,6 +64,8 @@ public class AppletIndexServiceImpl implements AppletIndexService { private ICommonOrderService commonOrderService; @Resource private ICommonMoneyLogService commonMoneyLogService; + @Resource + private ICommonCityService commonCityService; //支付接口 @Autowired private MpWxPayService mpWxPayService; @@ -97,31 +101,23 @@ public class AppletIndexServiceImpl implements AppletIndexService { return Result.OK("建材分类",list); } - + //获取城市 + @Override + public Result getCity(){ + return Result.OK("城市",commonCityService.list()); + } //获取建材商品信息列表带分页搜索 @Override - public Result getProductList(String shopIconId, String shopClassId, PageBean pageBean){ + public Result getProductList(String cityId,String shopIconId, String shopClassId, PageBean pageBean){ Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - if(shopIconId!=null){ - //根据iconId查询商品信息 - page = commonShopService.lambdaQuery() - .eq(CommonShop::getShopCion,shopIconId) - .page(page); - }else if(shopClassId!=null){ - //根据classId查询商品信息 - page = commonShopService.lambdaQuery() - .like(CommonShop::getShopClass,shopClassId) - .page(page); - }else if(pageBean.getTitle()!=null){ - //根据classId查询商品信息 page = commonShopService.lambdaQuery() - .like(CommonShop::getName,pageBean.getTitle()) + .like(StringUtils.isNotBlank(pageBean.getTitle()),CommonShop::getName,pageBean.getTitle()) + .eq(StringUtils.isNotBlank(shopIconId),CommonShop::getShopCion,shopIconId) + .eq(StringUtils.isNotBlank(shopClassId),CommonShop::getShopClass,shopClassId) + .eq(StringUtils.isNotBlank(cityId),CommonShop::getCityId,cityId) + .eq(CommonShop::getIsOpen,"Y") .page(page); - }else { - //查询所有商品信息 - page = commonShopService.page(page); - } return Result.OK("建材商品信息列表",page); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java index af36758..96b5cdd 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON; 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.Synchronized; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jeecg.api.bean.PageBean; @@ -27,11 +28,13 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.pay.MpWxPayService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.UUID; @Slf4j @Service @@ -191,8 +194,89 @@ public class AppletOrderServiceImpl implements AppletOrderService { CommonOrder commonOrder = commonOrderService.getById(outTradeNo); //如果该订单为未支付，修改订单状态 if (commonOrder.getStatus().equals("0")){ + commonOrder.setTitle("微信支付订单"); commonOrder.setStatus("1"); commonOrderService.updateById(commonOrder); + //查询用户信息 + HanHaiMember member = hanHaiMemberService.getById(commonOrder.getUserId()); + + CommonMoneyLog commonMoneyLog = new CommonMoneyLog(); + commonMoneyLog.setCreateTime(new Date()); + commonMoneyLog.setTitle("微信支付订单"); + commonMoneyLog.setMoney(commonOrder.getPrice()); + commonMoneyLog.setUserId(commonOrder.getUserId()); + commonMoneyLog.setOldMoney(member.getMoney()); + commonMoneyLog.setType(1); + commonMoneyLog.setState(1); + commonMoneyLogService.save(commonMoneyLog); + + //订单直推佣金 + BigDecimal oneMoney = commonOrder.getOneMoney(); + //订单间推佣金 + BigDecimal twoMoney = commonOrder.getTwoMoney(); + log.info("订单直推佣金："+oneMoney); + log.info("订单间推佣金："+twoMoney); + //返佣 + HanHaiMember hanHaiMember1 = hanHaiMemberService.getById(commonOrder.getUserId()); + log.info("下单用户："+hanHaiMember1.getNickName()+"电话号码："+hanHaiMember1.getPhone()); + log.info("订单号：" + commonOrder.getId()); + //上级标识 + String oneId = hanHaiMember1.getShareId(); + log.info("上级标识："+oneId); + //如果上级标识不为空 + if(StringUtils.isNotBlank(oneId)){ + HanHaiMember hanHaiMember2 = hanHaiMemberService.getById(oneId); + + if(hanHaiMember2 !=null) { + //上级返佣 + hanHaiMember2.setMoney(hanHaiMember2.getMoney().add(oneMoney)); + hanHaiMemberService.updateById(hanHaiMember2); + //添加佣金记录 + CommonMoneyLog moneyLog1 = new CommonMoneyLog(); + moneyLog1.setId(UUID.randomUUID().toString().replace("-", "")+"1"); + moneyLog1.setCreateTime(new Date()); + moneyLog1.setTitle("微信支付直推佣金"); + moneyLog1.setMoney(oneMoney); + moneyLog1.setUserId(hanHaiMember2.getId()); + moneyLog1.setOldMoney(hanHaiMember2.getMoney()); + moneyLog1.setType(0); + moneyLog1.setState(1); + commonMoneyLogService.save(moneyLog1); + + } + + } + //上上级标识 + String twoId = hanHaiMember1.getVid(); + log.info("上上级标识："+twoId); + if(StringUtils.isNotBlank(twoId)){ + HanHaiMember hanHaiMember3 = hanHaiMemberService.getById(twoId); + if(hanHaiMember3 !=null) { + //上级返佣 + hanHaiMember3.setMoney(hanHaiMember3.getMoney().add(twoMoney)); + hanHaiMemberService.updateById(hanHaiMember3); + //添加佣金记录 + CommonMoneyLog moneyLog2 = new CommonMoneyLog(); + moneyLog2.setId(UUID.randomUUID().toString().replace("-", "")+"2"); + moneyLog2.setCreateTime(new Date()); + moneyLog2.setTitle("微信支付间推佣金"); + moneyLog2.setMoney(twoMoney); + moneyLog2.setUserId(hanHaiMember3.getId()); + moneyLog2.setOldMoney(hanHaiMember3.getMoney()); + moneyLog2.setType(0); + moneyLog2.setState(1); + commonMoneyLogService.save(moneyLog2); + } + + } + + + + + + + + } return null; } @@ -202,6 +286,8 @@ public class AppletOrderServiceImpl implements AppletOrderService { //商城-加入购物车之后一次下多个订单 //商城-立即购买多少商品 + @Transactional + @Synchronized @Override public Result createSumOrder(String token,String list,String addressId,Integer payType,String orderAddId){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); @@ -238,6 +324,10 @@ public class AppletOrderServiceImpl implements AppletOrderService { if(null!=list1 && list1.size()>0){ //订单总额 BigDecimal totalPrice = new BigDecimal(0); + //总直推金额 + BigDecimal totalOneMoney = new BigDecimal(0); + //总二级代理金额 + BigDecimal totalTwoMoney = new BigDecimal(0); //订单商品数量 Integer totalNum = 0; @@ -252,6 +342,11 @@ public class AppletOrderServiceImpl implements AppletOrderService { //创建订单 BigDecimal price = commonShop.getPrice().multiply(new BigDecimal(sku.getNum())); + //创建直推佣金 + BigDecimal oneMoney = commonShop.getOneMoney().multiply(new BigDecimal(sku.getNum())); + + BigDecimal twoMoney = commonShop.getTwoMoney().multiply(new BigDecimal(sku.getNum())); + @@ -267,6 +362,8 @@ public class AppletOrderServiceImpl implements AppletOrderService { sku.setMaterial(commonShop.getMaterial()); sku.setCreateTime(new Date()); sku.setPrice(price); + sku.setOneMoney(oneMoney); + sku.setTwoMoney(twoMoney); sku.setImage(commonShop.getImage()); sku.setCreateTime(new Date()); @@ -277,6 +374,11 @@ public class AppletOrderServiceImpl implements AppletOrderService { totalPrice = totalPrice.add(price); totalNum = totalNum + sku.getNum(); + + totalOneMoney = totalOneMoney.add(oneMoney); + + totalTwoMoney = totalTwoMoney.add(twoMoney); + } @@ -294,6 +396,8 @@ public class AppletOrderServiceImpl implements AppletOrderService { cityOrder.setName(commonAddress.getName()); cityOrder.setTitle("组合订单"); cityOrder.setPrice(totalPrice); + cityOrder.setOneMoney(totalOneMoney); + cityOrder.setTwoMoney(totalTwoMoney); cityOrder.setPid("0"); cityOrder.setHasChild("1"); @@ -305,19 +409,107 @@ public class AppletOrderServiceImpl implements AppletOrderService { 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); + + if (payType==0){ + cityOrder.setTitle("余额支付订单"); + cityOrder.setStatus("1"); + commonOrderService.updateById(cityOrder); + HanHaiMember member = hanHaiMemberService.getById(hanHaiMember.getId()); + member.setMoney(member.getMoney().subtract(cityOrder.getPrice())); + + hanHaiMemberService.updateById(member); + CommonMoneyLog commonMoneyLog = new CommonMoneyLog(); + commonMoneyLog.setCreateTime(new Date()); + commonMoneyLog.setTitle("余额支付订单"); + commonMoneyLog.setMoney(cityOrder.getPrice()); + commonMoneyLog.setUserId(hanHaiMember.getId()); + commonMoneyLog.setOldMoney(member.getMoney()); + commonMoneyLog.setType(1); + commonMoneyLog.setState(1); + commonMoneyLogService.save(commonMoneyLog); + + + //订单直推佣金 + BigDecimal oneMoney = cityOrder.getOneMoney(); + //订单间推佣金 + BigDecimal twoMoney = cityOrder.getTwoMoney(); + log.info("订单直推佣金："+oneMoney); + log.info("订单间推佣金："+twoMoney); + //返佣 + HanHaiMember hanHaiMember1 = hanHaiMemberService.getById(cityOrder.getUserId()); + log.info("下单用户："+hanHaiMember1.getNickName()+"电话号码："+hanHaiMember1.getPhone()); + log.info("订单号：" + cityOrder.getId()); + //上级标识 + String oneId = hanHaiMember1.getShareId(); + log.info("上级标识："+oneId); + //如果上级标识不为空 + if(StringUtils.isNotBlank(oneId)){ + HanHaiMember hanHaiMember2 = hanHaiMemberService.getById(oneId); + + if(hanHaiMember2 !=null) { + //上级返佣 + hanHaiMember2.setMoney(hanHaiMember2.getMoney().add(oneMoney)); + hanHaiMemberService.updateById(hanHaiMember2); + //添加佣金记录 + CommonMoneyLog moneyLog1 = new CommonMoneyLog(); + moneyLog1.setId(UUID.randomUUID().toString().replace("-", "")+"1"); + moneyLog1.setCreateTime(new Date()); + moneyLog1.setTitle("余额支付直推佣金"); + moneyLog1.setMoney(oneMoney); + moneyLog1.setUserId(hanHaiMember2.getId()); + moneyLog1.setOldMoney(hanHaiMember2.getMoney()); + moneyLog1.setType(0); + moneyLog1.setState(1); + commonMoneyLogService.save(moneyLog1); + + } + + } + //上上级标识 + String twoId = hanHaiMember1.getVid(); + log.info("上上级标识："+twoId); + if(StringUtils.isNotBlank(twoId)){ + HanHaiMember hanHaiMember3 = hanHaiMemberService.getById(twoId); + if(hanHaiMember3 !=null) { + //上级返佣 + hanHaiMember3.setMoney(hanHaiMember3.getMoney().add(twoMoney)); + hanHaiMemberService.updateById(hanHaiMember3); + //添加佣金记录 + CommonMoneyLog moneyLog2 = new CommonMoneyLog(); + moneyLog2.setId(UUID.randomUUID().toString().replace("-", "")+"2"); + moneyLog2.setCreateTime(new Date()); + moneyLog2.setTitle("余额支付间推佣金"); + moneyLog2.setMoney(twoMoney); + moneyLog2.setUserId(hanHaiMember3.getId()); + moneyLog2.setOldMoney(hanHaiMember3.getMoney()); + moneyLog2.setType(0); + moneyLog2.setState(1); + commonMoneyLogService.save(moneyLog2); + } + + } + return Result.OK("余额支付成功"); + + }else{ + //吊起微信支付 + String s = totalPrice.multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(1).intValue(); + Object appOrder = mpWxPayService.createOrder( + "购买"+ "组合订单" , + "127.0.0.1", + orderId, + i1, + orderId, + hanHaiMember.getAppletOpenid(), + cityOrder.toString()); + + return Result.OK("支付成功",appOrder); + } + + + + + } return null; } 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 34d2a1c..9e8791b 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2025-05-07 + * @Date: 2025-06-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 7c3c293..4388f17 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2025-05-07 + * @Date: 2025-06-05 * @Version: V1.0 */ @Data @@ -47,6 +47,11 @@ public class CommonShop implements Serializable { /**更新日期*/ @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; + /**城市*/ + @Excel(name = "城市", width = 15, dictTable = "common_city", dicText = "name", dicCode = "id") + @Dict(dictTable = "common_city", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "城市") + private java.lang.String cityId; /**所属区域*/ @Excel(name = "所属区域", width = 15, dictTable = "common_icon_image", dicText = "title", dicCode = "id") @Dict(dictTable = "common_icon_image", dicText = "title", dicCode = "id") 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 6b2c816..1b52c06 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2025-05-07 + * @Date: 2025-06-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 28b6107..cb4aa31 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2025-05-07 + * @Date: 2025-06-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 84d5f95..f2408ea 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2025-05-07 + * @Date: 2025-06-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 f2db616..9c185ce 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue @@ -5,15 +5,22 @@ - - + + - - + + + 查询 @@ -147,6 +154,11 @@ align:"center", dataIndex: 'createTime' }, + { + title:'城市', + align:"center", + dataIndex: 'cityId_dictText' + }, { title:'所属区域', align:"center", @@ -255,6 +267,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'datetime',value:'createTime',text:'创建日期'}) + fieldList.push({type:'sel_search',value:'cityId',text:'城市',dictTable:"common_city", dictText:'name', dictCode:'id'}) fieldList.push({type:'sel_search',value:'shopCion',text:'所属区域',dictTable:"common_icon_image", dictText:'title', dictCode:'id'}) fieldList.push({type:'list_multi',value:'shopClass',text:'商品分类',dictTable:"common_shop_class", dictText:'title', dictCode:'id'}) fieldList.push({type:'string',value:'name',text:'商品标题',dictCode:''}) 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 99ac57a..08ed281 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 @@ -3,6 +3,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 eb415b9..7cc45fb 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 @@ -9,6 +9,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'createTime' }, + { + title: '城市', + align:"center", + dataIndex: 'cityId_dictText' + }, { title: '所属区域', align:"center", @@ -87,6 +92,15 @@ export const columns: BasicColumn[] = [ //查询数据 export const searchFormSchema: FormSchema[] = [ { + label: "城市", + field: "cityId", + component: 'JSearchSelect', + componentProps:{ + dict:"common_city,name,id" + }, + colProps: {span: 6}, + }, + { label: "所属区域", field: "shopCion", component: 'JSearchSelect', @@ -107,6 +121,14 @@ export const searchFormSchema: FormSchema[] = [ ]; //表单数据 export const formSchema: FormSchema[] = [ + { + label: '城市', + field: 'cityId', + component: 'JSearchSelect', + componentProps:{ + dict:"common_city,name,id" + }, + }, { label: '所属区域', field: 'shopCion',