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

Merge branch 'feature/mall_product_new'

pull/2/head^2
perry 2023-05-29 12:55:27 +08:00
parent 9b5f694e1b 524d0fc077
commit d699437155
18 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
View File

@ -20,10 +20,7 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -63,10 +60,10 @@ public class MemberController {
return CommonResult.success(rechargeOrderService.memberOrderInfo());
}
@Operation(summary = "获取当前登录账号的推广员推广会员记录")
@RequestMapping(value = "/promoterOrderInfo", method = RequestMethod.GET)
@RequestMapping(value = "/promoterOrderInfo", method = RequestMethod.POST)
@PreAuthenticated
@TenantIgnore
public CommonResult<PageResult<RechargeOrderRespVO>> promoterOrderInfo(RechargeOrderPageReqVO pageRespVO) {
public CommonResult<PageResult<RechargeOrderRespVO>> promoterOrderInfo(@RequestBody RechargeOrderPageReqVO pageRespVO) {
pageRespVO.setPromoterId(SecurityFrameworkUtils.getLoginUserId());
return CommonResult.success(rechargeOrderService.promoterOrderInfo(pageRespVO));
}

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -207,7 +207,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(LocalDateTime.now()));
appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(LocalDateTime.now()));
}else if (type == 2){
LocalDateTime todayOfLastWeek = LocalDateTime.now();
LocalDateTime todayOfLastWeek = LocalDateTime.now().minusDays(7);
LocalDateTime monday = todayOfLastWeek.with(TemporalAdjusters.previous(DayOfWeek.SUNDAY)).plusDays(1);
LocalDateTime sunday = todayOfLastWeek.with(TemporalAdjusters.next(DayOfWeek.MONDAY)).minusDays(1);
appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(monday));
@ -219,7 +219,8 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(firstDay));
appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(lastDay));
}
promoterMemberOrderVO.setTotalAmount(rechargeOrderMapper.promoterOrderCount(appUserInfoReqDTO.getStartTime(),appUserInfoReqDTO.getEndTime(),promoterId));
BigDecimal totalAmount =rechargeOrderMapper.promoterOrderCount(appUserInfoReqDTO.getStartTime(),appUserInfoReqDTO.getEndTime(),promoterId);
promoterMemberOrderVO.setTotalAmount(totalAmount);
promoterMemberOrderVO.setMemberCount(memberUserApi.promoterOrderCount(appUserInfoReqDTO));
TenantDTO tenantDTO = tenantApi.getTenant(TenantContextHolder.getTenantId());
promoterMemberOrderVO.setMemberCommission(tenantDTO.getMemberCommission());

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

@ -71,7 +71,9 @@ spring:
password: 20221122@dev # 密码，建议生产环境开启
--- #################### 定时任务相关配置 ####################
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# Quartz 配置项，对应 QuartzProperties 配置类
spring:
quartz:

24
yudao-ui-admin/src/router/index.js
View File

@ -64,18 +64,18 @@ export const constantRoutes = [
component: (resolve) => require(['@/views/error/401'], resolve),
hidden: true
},
{
path: '',
component: Layout,
redirect: 'index',
children: [{
path: 'index',
component: (resolve) => require(['@/views/index'], resolve),
name: '首页',
meta: {title: '首页', icon: 'dashboard', affix: true}
}
]
},
// {
// path: '',
// component: Layout,
// redirect: 'index',
// children: [{
// path: 'index',
// component: (resolve) => require(['@/views/index'], resolve),
// name: '首页',
// meta: {title: '首页', icon: 'dashboard', affix: true}
// }
// ]
// },
{
path: '/user',
component: Layout,

2
yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
View File

@ -158,7 +158,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="onClose('ruleForm')">取 消</el-button>
<el-button type="primary" :loading="loading" @click="onsubmit('ruleForm')" v-hasPermi="['deliverGoods:freightSet:update']">确 定</el-button>
<el-button type="primary" :loading="loading" @click="onsubmit('ruleForm')">确 定</el-button>
</span>
</el-dialog>
</template>

6
yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue
View File

@ -11,7 +11,7 @@
</el-form-item>
</el-form>
</div>
<el-button type="primary" size="mini" @click="handleSubmit()" v-hasPermi="['deliverGoods:freightSet:create']">添加运费模板</el-button>
<el-button type="primary" size="mini" @click="handleSubmit()" v-hasPermi="['admin:shipping:templates:save']">添加运费模板</el-button>
</div>
<el-table
v-loading="loading"
@ -70,8 +70,8 @@
label="操作"
>
<template slot-scope="scope">
<el-button type="text" size="small" @click="bindEdit(scope.row)" v-hasPermi="['deliverGoods:freightSet:update']">修改</el-button>
<el-button type="text" size="small" @click="bindDelete(scope.row)" v-hasPermi="['deliverGoods:freightSet:delete']">删除</el-button>
<el-button type="text" size="small" @click="bindEdit(scope.row)" v-hasPermi="['admin:shipping:templates:update']">修改</el-button>
<el-button type="text" size="small" @click="bindDelete(scope.row)" v-hasPermi="['admin:shipping:templates:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>

8
yudao-ui-admin/src/views/mall/product/property/index.vue
View File

@ -12,8 +12,8 @@
</el-form>
</div>
<div class="acea-row">
<el-button size="small" type="primary" @click="add" v-hasPermi="['product:property:create']">添加商品规格</el-button>
<el-button size="small" @click="handleDeleteAll" v-hasPermi="['product:property:delete']">批量删除</el-button>
<el-button size="small" type="primary" @click="add" v-hasPermi="['admin:product:rule:save']">添加商品规格</el-button>
<el-button size="small" @click="handleDeleteAll" v-hasPermi="['admin:product:rule:delete']">批量删除</el-button>
</div>
</div>
<el-table
@ -57,8 +57,8 @@
</el-table-column>
<el-table-column label="操作" min-width="120" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="onEdit(scope.row)" class="mr10" v-hasPermi="['product:property:update']">编辑</el-button>
<el-button type="text" size="small" @click="handleDelete(scope.row.id, scope.$index)" v-hasPermi="['product:property:delete']">删除</el-button>
<el-button type="text" size="small" @click="onEdit(scope.row)" class="mr10" v-hasPermi="['admin:product:rule:update']">编辑</el-button>
<el-button type="text" size="small" @click="handleDelete(scope.row.id, scope.$index)" v-hasPermi="['admin:product:rule:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>

2
yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
View File

@ -37,7 +37,7 @@
:picker-options="datePickerOptions" :default-time="['00:00:00', '23:59:59']" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['trade:after-sale:query']">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>

4
yudao-ui-admin/src/views/member/promoter/index.vue
View File

@ -21,7 +21,7 @@
<el-input v-model="queryParams.mobile" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['member:promoter:query']">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -35,7 +35,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"
v-hasPermi="['system:user:import']">导入
v-hasPermi="['member:promoter:export']">导入
</el-button>
</el-col>
<el-col :span="1.5">

2
yudao-ui-admin/src/views/member/user/index.vue
View File

@ -17,7 +17,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['member:user:query']">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>

2
yudao-ui-admin/src/views/shop/phoneRecord/index.vue
View File

@ -9,7 +9,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['shop:phone-record:query']">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>

2
yudao-ui-admin/src/views/shop/rechargeGear/index.vue
View File

@ -7,7 +7,7 @@
<el-input v-model="queryParams.name" placeholder="请输入档位名称" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['shop:recharge-gear:query']">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>

8
yudao-ui-admin/src/views/shop/rechargeOrder/index.vue
View File

@ -28,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['shop:recharge-order:query']">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -90,12 +90,12 @@
<template v-slot="scope">
<template v-if="scope.row.refundStatus === 1">
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleRefund(scope.row, 1)"
v-hasPermi="['shop:recharge-order:delete']">同意退款</el-button>
v-hasPermi="['shop:recharge-order:refund']">同意退款</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleRefund(scope.row, 2)"
v-hasPermi="['shop:recharge-order:delete']">拒绝退款</el-button>
v-hasPermi="['shop:recharge-order:refund']">拒绝退款</el-button>
</template>
<el-button v-if="scope.row.refundStatus !== 2 && scope.row.refundStatus !== 3 && scope.row.paid==1" size="mini" type="text" icon="el-icon-edit" @click="handleRefund(scope.row, 3)"
v-hasPermi="['shop:recharge-order:update']">发起退款</el-button>
v-hasPermi="['shop:recharge-order:refund']">发起退款</el-button>
</template>
</el-table-column>
</el-table>

1
yudao-ui-app/App.vue
View File

@ -219,7 +219,6 @@
// 获取推广员ID
setSpreadId() {
const spreadId = this.$route.query.spreadId || ''
console.log('spreadId', spreadId)
if (spreadId) {
this.$store.commit("SET_SPREADID", spreadId);
}

4
yudao-ui-app/libs/pay.js
View File

@ -42,9 +42,9 @@ const unityPay = (options) => {
}
_options.payInfo.openid = openId
if (_options.payType === 'WXPAY') {
_options.payInfo.payChannel = '微信支付'
_options.payInfo.payChannel = 'public'
} else if (_options.payType === 'ALIPAY') {
_options.payInfo.payChannel = '支付宝'
_options.payInfo.payChannel = 'appAliPay'
}
uni.showLoading({
title: '支付中',

1
yudao-ui-app/pages/goods_cashier/index.vue
View File

@ -198,7 +198,6 @@
payType: that.paytype,
createOrderFun: wechatOrderPay,
payResultHandle: (res) => {
console.log(res)
return {
jsapiResult: res.jsapiConfig,
body: res.body

2
yudao-ui-app/pages/index/index.vue
View File

@ -208,7 +208,7 @@
followHid: true,
followCode: false,
logoUrl: "",
bannerList: {},
bannerList: [],
imgUrls: [],
itemNew: [],
menus: [],

1
yudao-ui-app/utils/request.js
View File

@ -26,7 +26,6 @@ function baseRequest(url, method, data, {
if (!noAuth) {
//登录过期自动登录
if (!store.state.app.token && !checkLogin()) {
console.log(store.state.app.token,checkLogin(),123123)
toLogin();
return Promise.reject({
msg: '未登录'