zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品管理

pull/2/head
perry 2023-05-12 19:04:02 +08:00
parent b502c67b65
commit dece26fce7
22 changed files with 57 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java
View File

@ -36,6 +36,9 @@ public class ShippingTemplatesFreeRespVO implements Serializable {
@NotNull(message = "请选择城市")
private String cityId;
@Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4")
private String provinceId;
@Schema(description = "城市名称描述")
private String title;

5
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java
View File

@ -33,4 +33,9 @@ public class ShippingTemplatesNoDeliveryRespVO implements Serializable {
@Schema(description = "城市ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4")
@NotNull(message = "请选择城市")
private String cityId;
@Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4")
private String provinceId;
}

2
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java
View File

@ -36,6 +36,8 @@ public class ShippingTemplatesRegionRespVO implements Serializable {
@NotNull(message = "请选择城市")
private String cityId;
@Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4")
private String provinceId;
@Schema(description = "城市名称描述")
private String title;

6
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesReqVO.java
View File

@ -55,7 +55,11 @@ public class ShippingTemplatesReqVO implements Serializable {
@Schema(description = "指定包邮设置", required = true)
private List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList;
@Schema(description = "指定不包邮设置", required = true)
@Schema(description = "指定不送", example = "1", required = true)
private Boolean noDelivery;
@Schema(description = "指定不送设置", required = true)
private List<ShippingTemplatesNoDeliveryRespVO> shippingTemplatesNoDeliveryRespVOS;
@Schema(description = "排序", example = "0")

5
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesDO.java
View File

@ -45,6 +45,11 @@ public class ShippingTemplatesDO extends TenantBaseDO {
*指定包邮
*/
private Boolean appoint;
/**
*指定不送
*/
private Boolean noDelivery;
/**
*排序

2
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesFreeDO.java
View File

@ -38,6 +38,8 @@ public class ShippingTemplatesFreeDO implements Serializable {
*/
private Integer tempId;
private Integer provinceId;
/**
*城市ID
*/

6
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java
View File

@ -42,10 +42,8 @@ public class ShippingTemplatesNoDeliveryDO implements Serializable {
*/
private Integer cityId;
/**
*省份ID
*/
private Integer province_id;
private Integer provinceId;
}

3
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesRegionDO.java
View File

@ -43,6 +43,9 @@ public class ShippingTemplatesRegionDO implements Serializable {
*/
private Integer cityId;
private Integer provinceId;
/**
*描述
*/

8
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
View File

@ -23,7 +23,7 @@ import cn.iocoder.yudao.module.shop.service.order.StoreOrderRefundService;
import cn.iocoder.yudao.module.shop.service.order.StoreOrderService;
import cn.iocoder.yudao.module.shop.service.order.StoreOrderStatusService;
import cn.iocoder.yudao.module.shop.utils.CommonPage;
import cn.iocoder.yudao.module.shop.utils.OrderUtils;
import cn.iocoder.yudao.module.shop.utils.OrderUtil;
import cn.iocoder.yudao.module.shop.utils.RedisUtil;
import cn.iocoder.yudao.module.shop.vo.order.LogisticsResultVo;
import cn.iocoder.yudao.module.shop.vo.order.StoreDateRangeSqlPram;
@ -81,7 +81,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
private StoreOrderRefundService storeOrderRefundService;
@Autowired
private OrderUtils orderUtils;
private OrderUtil orderUtil;
@Autowired
private RedisUtil redisUtil;
@ -164,7 +164,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
public List<StoreOrder> getUserOrderList(Integer uid, Integer status, PageParam pageParamRequest) {
PageHelper.startPage(pageParamRequest.getPageNo(), pageParamRequest.getPageSize());
LambdaQueryWrapper<StoreOrder> lqw = new LambdaQueryWrapper<>();
orderUtils.statusApiByWhere(lqw, status);
orderUtil.statusApiByWhere(lqw, status);
lqw.eq(StoreOrder::getUid, uid);
lqw.orderByDesc(StoreOrder::getId);
return mapper.selectList(lqw);
@ -204,7 +204,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
@Override
public Long getTopDataUtil(Integer status, Integer userId) {
LambdaQueryWrapper<StoreOrder> lqw = new LambdaQueryWrapper<>();
orderUtils.statusApiByWhere(lqw, status);
orderUtil.statusApiByWhere(lqw, status);
lqw.eq(StoreOrder::getUid,userId);
return mapper.selectCount(lqw);
}

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/product/impl/StoreProductServiceImpl.java
View File

@ -92,7 +92,7 @@ public class StoreProductServiceImpl extends ServiceImpl<StoreProductMapper, Sto
@Autowired
private StoreProductAttrResultService storeProductAttrResultService;
@Autowired
private StoreCartService storeCartService;
@Autowired

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/OrderUtils.java → yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/OrderUtil.java
View File

@ -5,10 +5,11 @@ import cn.iocoder.yudao.framework.common.enums.Constants;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrder;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
@Service
public class OrderUtils {
@Component
public class OrderUtil {
/**
* h5 订单查询 where status 封装

13
yudao-server/src/main/resources/application.yaml
View File

@ -86,7 +86,7 @@ aj:
cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存
timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行
type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选
water-mark: 芋道源码 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
water-mark: 创盈云 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
interference-options: 0 # 滑动干扰项(0/1/2)
req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false
req-get-lock-limit: 5 # 验证失败 5 次，get接口锁定
@ -113,7 +113,7 @@ yudao:
maxOnlineCount: 0 # 最大连接人数
sessionMap: true # 保存sessionMap
swagger:
title: 芋道快速开发平台
title: 创盈云
description: 提供管理后台、用户 App 的所有功能
version: ${yudao.info.version}
url: ${yudao.web.admin-ui.url}
@ -188,6 +188,7 @@ yudao:
- rep_demo_jianpiao
- tmp_report_data_1
- tmp_report_data_income
- eb_shipping_templates
- eb_shipping_templates_free
- eb_shipping_templates_no_delivery
- eb_shipping_templates_region
@ -195,6 +196,14 @@ yudao:
- eb_store_product_attr_result
- eb_store_product_attr_value
- eb_store_product_description
- eb_store_cart
- eb_store_product
- eb_store_product_cate
- eb_store_product_log
- eb_store_product_relation
- eb_store_product_rule
- eb_store_product_reply
- eb_user_address
sms-code: # 短信验证码相关的配置项
expire-times: 10m
send-frequency: 1m

2
yudao-server/src/test/java/cn/iocoder/yudao/ProjectReactor.java
View File

@ -28,7 +28,7 @@ public class ProjectReactor {
private static final String GROUP_ID = "cn.iocoder.boot";
private static final String ARTIFACT_ID = "yudao";
private static final String PACKAGE_NAME = "cn.iocoder.yudao";
private static final String TITLE = "芋道管理系统";
private static final String TITLE = "创盈商户管理系统";
/**
* 白名单文件，不进行重写，避免出问题

2
yudao-ui-admin/.env.dev
View File

@ -2,7 +2,7 @@
ENV = 'development'
# 页面标题
VUE_APP_TITLE = 芋道管理系统
VUE_APP_TITLE = 创盈商户管理系统
# 芋道管理系统/开发环境
VUE_APP_BASE_API = 'http://localhost:48080'

2
yudao-ui-admin/.env.front
View File

@ -2,7 +2,7 @@
ENV = 'development'
# 页面标题
VUE_APP_TITLE = 芋道管理系统
VUE_APP_TITLE = 创盈商户管理系统
# 芋道管理系统/本地环境
VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'

2
yudao-ui-admin/.env.local
View File

@ -2,7 +2,7 @@
ENV = 'development'
# 页面标题
VUE_APP_TITLE = 芋道管理系统
VUE_APP_TITLE = 创盈商户管理系统
# 芋道管理系统/本地环境
# VUE_APP_BASE_API = '/proxy-api'

2
yudao-ui-admin/.env.prod
View File

@ -2,7 +2,7 @@
ENV = 'production'
# 页面标题
VUE_APP_TITLE = 芋道管理系统
VUE_APP_TITLE = 创盈商户管理系统
# 芋道管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'

2
yudao-ui-admin/.env.stage
View File

@ -1,7 +1,7 @@
NODE_ENV = production
# 页面标题
VUE_APP_TITLE = 芋道管理系统
VUE_APP_TITLE = 创盈商户管理系统
# 测试环境配置
ENV = 'staging'

2
yudao-ui-admin/.env.static
View File

@ -4,7 +4,7 @@ NODE_ENV = development
ENV = 'staging'
# 页面标题
VUE_APP_TITLE = 芋道管理系统
VUE_APP_TITLE = 创盈商户管理系统
# 芋道管理系统/测试环境
VUE_APP_BASE_API = 'http://127.0.0.1:48080'

4
yudao-ui-admin/package.json
View File

@ -1,8 +1,8 @@
{
"name": "yudao-ui-admin",
"version": "1.7.2-snapshot",
"description": "芋道管理系统",
"author": "芋道",
"description": "创盈商户管理系统",
"author": "perry",
"license": "MIT",
"scripts": {
"local": "vue-cli-service serve --mode local",

2
yudao-ui-admin/src/layout/components/Sidebar/Logo.vue
View File

@ -35,7 +35,7 @@ export default {
},
data() {
return {
title: '芋道管理系统',
title: '创盈商户管理系统',
logo: logoImg
}
}

2
yudao-ui-admin/vue.config.js
View File

@ -8,7 +8,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '芋道管理系统' // 网页标题
const name = process.env.VUE_APP_TITLE || '创盈商户管理系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口