root/allLikeMall
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: root:cc6370087214adf097e9ad3de5e81b3cb63bfc74
Branches Tags
root:master
root:hy
root:sjy-three
root:Branch_chensl
root:sjy-two
root:khy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy
...
compare: root:268bc18530d4498ebbead89869b618ce3442a46f
Branches Tags
root:hy
root:master
root:sjy-three
root:Branch_chensl
root:sjy-two
root:khy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy

4 Commits
cc63700872 ... 268bc18530

Author SHA1 Message Date
XinWei
268bc18530 后台-修改余额功能存入钱包流水 2024-09-25 17:05:46 +08:00
XinWei
ae40079e66 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-09-25 15:44:30 +08:00
root
b948918240 Merge pull request '9、我的服务后台与小程序的图标大小调整与显示一行四列并且不用轮播直接向下排列' (#16) from Branch_csl into master 
Reviewed-on: #16
 2024-09-25 15:22:05 +08:00
77
8af485a215 9、我的服务后台与小程序的图标大小调整与显示一行四列并且不用轮播直接向下排列 
10、后台 营销文章装修模块调整为列表（无法选择某一篇文章只能显示全部）
 11、后台 装修用户组件隐藏
 2024-09-25 15:17:18 +08:00
9 changed files with 293 additions and 153 deletions
Show Stats Expand all files Collapse all files

62
yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuList/index.vue
View File

@ -1,31 +1,45 @@
<template> <template>
<div class="min-h-42px flex flex-col"> <div class="min-h-42px flex flex-col">
<div <div v-for="(item, index) in property.list" :key="index"
v-for="(item, index) in property.list" class="item h-42px flex flex-row items-center justify-between gap-4px p-x-12px">
:key="index" <div class="flex flex-1 flex-row items-center gap-8px">
class="item h-42px flex flex-row items-center justify-between gap-4px p-x-12px" <el-image v-if="item.iconUrl" class="wh" :src="item.iconUrl" />
> <span class="text-16px" :style="{ color: item.titleColor }">{{ item.title }}</span>
<div class="flex flex-1 flex-row items-center gap-8px"> </div>
<el-image v-if="item.iconUrl" class="h-16px w-16px" :src="item.iconUrl" /> <div class="item-center flex flex-row justify-center gap-4px">
<span class="text-16px" :style="{ color: item.titleColor }">{{ item.title }}</span> <span class="text-12px" :style="{ color: item.subtitleColor }">{{ item.subtitle }}</span>
</div> <Icon icon="ep-arrow-right" color="#000" :size="16" />
<div class="item-center flex flex-row justify-center gap-4px"> </div>
<span class="text-12px" :style="{ color: item.subtitleColor }">{{ item.subtitle }}</span> </div>
<Icon icon="ep-arrow-right" color="#000" :size="16" /> </div>
</div>
</div>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { MenuListProperty } from './config' import { MenuListProperty } from './config'
/** 列表导航 */ /** 列表导航 */
defineOptions({ name: 'MenuList' }) defineOptions({ name: 'MenuList' })
defineProps<{ property: MenuListProperty }>() defineProps<{ property : MenuListProperty }>()
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.item + .item { .item+.item {
border-top: 1px solid #eee; border-top: 1px solid #eee;
} }
</style>
.wh {
width: 77px;
height: 20px;
position: relative;
padding-right: 10px;
&::after{
position:absolute;
content:'';
top:50%;
right:0;
width:1px;
height:57%;
border-right:1px solid #ababab;
transform: translateY(-50%);
}
}
</style>

262
yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuSwiper/index.vue
View File

@ -1,119 +1,161 @@
<template> <template>
<el-carousel <!-- <el-carousel :height="`${carouselHeight}px`" :autoplay="false" arrow="hover" indicator-position="outside">
:height="`${carouselHeight}px`" <el-carousel-item v-for="(page, pageIndex) in pages" :key="pageIndex">
:autoplay="false" <div class="flex flex-row flex-wrap">
arrow="hover" <div v-for="(item, index) in page" :key="index"
indicator-position="outside" class="relative flex flex-col items-center justify-center"
> :style="{ width: columnWidth, height: `${rowHeight}px` }"> -->
<el-carousel-item v-for="(page, pageIndex) in pages" :key="pageIndex"> <!-- 图标 + 角标 -->
<div class="flex flex-row flex-wrap"> <!-- <div class="relative" :class="`h-${ICON_SIZE}px w-${ICON_SIZE}px`"> -->
<div <!-- 右上角角标 -->
v-for="(item, index) in page" <!-- <span v-if="item.badge?.show"
:key="index" class="absolute right--10px top--10px z-1 h-20px rounded-10px p-x-6px text-center text-12px leading-20px"
class="relative flex flex-col items-center justify-center" :style="{ color: item.badge.textColor, backgroundColor: item.badge.bgColor }">
:style="{ width: columnWidth, height: `${rowHeight}px` }" {{ item.badge.text }}
> </span>
<!-- 图标 + 角标 --> <el-image v-if="item.iconUrl" :src="item.iconUrl" class="h-full w-full" />
<div class="relative" :class="`h-${ICON_SIZE}px w-${ICON_SIZE}px`"> </div> -->
<!-- 右上角角标 --> <!-- 标题 -->
<span <!-- <span v-if="property.layout === 'iconText'" class="text-12px" :style="{
v-if="item.badge?.show" color: item.titleColor,
class="absolute right--10px top--10px z-1 h-20px rounded-10px p-x-6px text-center text-12px leading-20px" height: `${TITLE_HEIGHT}px`,
:style="{ color: item.badge.textColor, backgroundColor: item.badge.bgColor }" lineHeight: `${TITLE_HEIGHT}px`
> }">
{{ item.badge.text }} {{ item.title }}
</span> </span>
<el-image v-if="item.iconUrl" :src="item.iconUrl" class="h-full w-full" /> </div>
</div> </div>
<!-- 标题 --> </el-carousel-item>
<span </el-carousel> -->
v-if="property.layout === 'iconText'" <view class="title">
class="text-12px" 我的服务
:style="{ </view>
color: item.titleColor, <view class="newList">
height: `${TITLE_HEIGHT}px`,
lineHeight: `${TITLE_HEIGHT}px` <view class="new_menu" v-for="(page, pageIndex) in pages" :key="pageIndex">
}" <view v-for="(item, index) in page" :key="index" class="new_items" :style="{ width: columnWidth}">
> <!-- 图标 + 角标 -->
{{ item.title }} <div class="relative" :class="`h-24px w-24px`">
</span> <!-- 右上角角标 -->
</div> <span v-if="item.badge?.show"
</div> class="absolute right--10px top--10px z-1 h-20px rounded-10px p-x-6px text-center text-12px leading-20px"
</el-carousel-item> :style="{ color: item.badge.textColor, backgroundColor: item.badge.bgColor }">
</el-carousel> {{ item.badge.text }}
</span>
<el-image v-if="item.iconUrl" :src="item.iconUrl" class="h-full w-full" />
</div>
<!-- 标题 -->
<span v-if="property.layout === 'iconText'" class="text-12px new_title" :style="{
color: item.titleColor,
height: `${TITLE_HEIGHT}px`,
lineHeight: `${TITLE_HEIGHT}px`
}">
{{ item.title }}
</span>
</view>
</view>
</view>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { MenuSwiperProperty, MenuSwiperItemProperty } from './config' import { MenuSwiperProperty, MenuSwiperItemProperty } from './config'
/** 菜单导航 */ /** 菜单导航 */
defineOptions({ name: 'MenuSwiper' }) defineOptions({ name: 'MenuSwiper' })
const props = defineProps<{ property: MenuSwiperProperty }>() const props = defineProps<{ property : MenuSwiperProperty }>()
// 标题的高度 // 标题的高度
const TITLE_HEIGHT = 20 const TITLE_HEIGHT = 20
// 图标的高度 // 图标的高度
const ICON_SIZE = 42 const ICON_SIZE = 42
// 垂直间距：一行上下的间距 // 垂直间距：一行上下的间距
const SPACE_Y = 16 const SPACE_Y = 16
// 分页 // 分页
const pages = ref<MenuSwiperItemProperty[][]>([]) const pages = ref<MenuSwiperItemProperty[][]>([])
// 轮播图高度 // 轮播图高度
const carouselHeight = ref(0) const carouselHeight = ref(0)
// 行高 // 行高
const rowHeight = ref(0) const rowHeight = ref(0)
// 列宽 // 列宽
const columnWidth = ref('') const columnWidth = ref('')
watch( watch(
() => props.property, () => props.property,
() => { () => {
// 计算列宽：每一列的百分比 // 计算列宽：每一列的百分比
columnWidth.value = `${100 * (1 / props.property.column)}%` columnWidth.value = `${100 * (1 / props.property.column)}%`
// 计算行高：图标 + 文字（仅显示图片时为0） + 垂直间距 * 2 // 计算行高：图标 + 文字（仅显示图片时为0） + 垂直间距 * 2
rowHeight.value = rowHeight.value =
(props.property.layout === 'iconText' ? ICON_SIZE + TITLE_HEIGHT : ICON_SIZE) + SPACE_Y * 2 (props.property.layout === 'iconText' ? ICON_SIZE + TITLE_HEIGHT : ICON_SIZE) + SPACE_Y * 2
// 计算轮播的高度：行数 * 行高 // 计算轮播的高度：行数 * 行高
carouselHeight.value = props.property.row * rowHeight.value carouselHeight.value = props.property.row * rowHeight.value
// 每页数量：行数 * 列数 // 每页数量：行数 * 列数
const pageSize = props.property.row * props.property.column const pageSize = props.property.row * props.property.column
// 清空分页 // 清空分页
pages.value = [] pages.value = []
// 每一页的菜单 // 每一页的菜单
let pageItems: MenuSwiperItemProperty[] = [] let pageItems : MenuSwiperItemProperty[] = []
for (const item of props.property.list) { for (const item of props.property.list) {
// 本页满员，新建下一页 // 本页满员，新建下一页
if (pageItems.length === pageSize) { if (pageItems.length === pageSize) {
pageItems = [] pageItems = []
} }
// 增加一页 // 增加一页
if (pageItems.length === 0) { if (pageItems.length === 0) {
pages.value.push(pageItems) pages.value.push(pageItems)
} }
// 本页增加一个 // 本页增加一个
pageItems.push(item) pageItems.push(item)
} }
}, },
{ immediate: true, deep: true } { immediate: true, deep: true }
) )
</script> </script>
<style lang="scss"> <style lang="scss">
// 重写指示器样式，与 APP 保持一致 .title {
:root { padding: 10px 20px;
.el-carousel__indicator { height: 20px;
padding-top: 0; line-height: 20px;
padding-bottom: 0; font-size: 12px;
.el-carousel__button { font-weight: 600;
--el-carousel-indicator-height: 6px; // border-bottom: 1px solid #dcdcdc;
--el-carousel-indicator-width: 6px; margin-bottom:20px;
--el-carousel-indicator-out-color: #ff6000; }
border-radius: 6px; .new_menu {
} display: flex;
} flex-wrap: wrap;
.el-carousel__indicator.is-active {
.el-carousel__button { .new_items {
--el-carousel-indicator-width: 12px; width: 25%;
} margin-bottom: 20px;
} display: flex;
} justify-content: center;
</style> flex-wrap: wrap;
.new_title{
width:100%;
text-align: center;
}
}
}
// 重写指示器样式，与 APP 保持一致
:root {
.el-carousel__indicator {
padding-top: 0;
padding-bottom: 0;
.el-carousel__button {
--el-carousel-indicator-height: 6px;
--el-carousel-indicator-width: 6px;
--el-carousel-indicator-out-color: #ff6000;
border-radius: 6px;
}
}
.el-carousel__indicator.is-active {
.el-carousel__button {
--el-carousel-indicator-width: 12px;
}
}
}
</style>

68
yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionArticle/index.vue
View File

@ -1,7 +1,27 @@
<template> <template>
<div class="min-h-30px" v-html="article?.content"></div> <div class="min-h-30px" >
<view class="floxt">
<view class="addClass" v-for="(item, index) in article?.list" :key="index" >
<view class="image">
<img
:src="item.picUrl"
alt="" />
</view>
<view class="text">
<view class="top">
{{item.title}}
</view>
<view class="bottom">
<!-- {{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }} -->
{{ formatDate(item.createTime) }}
</view>
</view>
</view>
</view>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { formatDate } from '@/utils/formatTime'
import { PromotionArticleProperty } from './config' import { PromotionArticleProperty } from './config'
import * as ArticleApi from '@/api/mall/promotion/article/index' import * as ArticleApi from '@/api/mall/promotion/article/index'
@ -15,7 +35,9 @@ watch(
() => props.property.id, () => props.property.id,
async () => { async () => {
if (props.property.id) { if (props.property.id) {
article.value = await ArticleApi.getArticle(props.property.id) // article.value = await ArticleApi.getArticle(props.property.id)
article.value = await ArticleApi.getArticlePage()
console.log(article.value,"article.value");
} }
}, },
{ {
@ -24,4 +46,44 @@ watch(
) )
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss">
.floxt {
width: 100%;
.addClass {
background:white;
display: flex;
justify-content: space-between;
width: 100%;
margin:8px 0;
// padding: 40px;
// padding-right: 0;
// height: 200px;
.image {
width: 130px;
height: 81px;
margin-right: 18px;
padding:8px 8px;
display:flex;
img{
width: 100%;
height: 100%;
}
}
.text {
display: flex;
width: 100%;
// text-align: center;
padding:20px 20px;
flex:1;
flex-direction: column;
justify-content: space-between;
.bottom{
color: #999;
font-size: 12px;
}
}
}
}
</style>

10
yudao-admin-vue3/src/components/DiyEditor/util.ts
View File

@ -135,11 +135,11 @@ export const PAGE_LIBS = [
] ]
}, },
{ name: '商品组件', extended: true, components: ['ProductCard', 'ProductList'] }, { name: '商品组件', extended: true, components: ['ProductCard', 'ProductList'] },
{ // {
name: '用户组件', // name: '用户组件',
extended: true, // extended: true,
components: ['UserCard', 'UserOrder', 'UserWallet', 'UserCoupon'] // components: ['UserCard', 'UserOrder', 'UserWallet', 'UserCoupon']
}, // },
{ {
name: '营销组件', name: '营销组件',
extended: true, extended: true,

3
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
View File

@ -47,6 +47,7 @@ public interface ErrorCodeConstants {
ErrorCode WALLET_REFUND_EXIST = new ErrorCode(1_007_007_003, "已经存在钱包退款"); ErrorCode WALLET_REFUND_EXIST = new ErrorCode(1_007_007_003, "已经存在钱包退款");
ErrorCode WALLET_FREEZE_PRICE_NOT_ENOUGH = new ErrorCode(1_007_007_004, "钱包冻结余额不足"); ErrorCode WALLET_FREEZE_PRICE_NOT_ENOUGH = new ErrorCode(1_007_007_004, "钱包冻结余额不足");
// ========== 钱包充值模块 1-007-008-000 ========== // ========== 钱包充值模块 1-007-008-000 ==========
ErrorCode WALLET_RECHARGE_NOT_FOUND = new ErrorCode(1_007_008_000, "钱包充值记录不存在"); ErrorCode WALLET_RECHARGE_NOT_FOUND = new ErrorCode(1_007_008_000, "钱包充值记录不存在");
ErrorCode WALLET_RECHARGE_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1_007_008_001, "钱包充值更新支付状态失败，钱包充值记录不是【未支付】状态"); ErrorCode WALLET_RECHARGE_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1_007_008_001, "钱包充值更新支付状态失败，钱包充值记录不是【未支付】状态");
@ -62,6 +63,8 @@ public interface ErrorCodeConstants {
ErrorCode WALLET_RECHARGE_PACKAGE_NOT_FOUND = new ErrorCode(1_007_008_011, "钱包充值套餐不存在"); ErrorCode WALLET_RECHARGE_PACKAGE_NOT_FOUND = new ErrorCode(1_007_008_011, "钱包充值套餐不存在");
ErrorCode WALLET_RECHARGE_PACKAGE_IS_DISABLE = new ErrorCode(1_007_008_012, "钱包充值套餐已禁用"); ErrorCode WALLET_RECHARGE_PACKAGE_IS_DISABLE = new ErrorCode(1_007_008_012, "钱包充值套餐已禁用");
ErrorCode WALLET_RECHARGE_PACKAGE_NAME_EXISTS = new ErrorCode(1_007_008_013, "钱包充值套餐名称已存在"); ErrorCode WALLET_RECHARGE_PACKAGE_NAME_EXISTS = new ErrorCode(1_007_008_013, "钱包充值套餐名称已存在");
ErrorCode WALLET_RECHARGE_RANGE_EXCEPTION = new ErrorCode(1_007_007_004, "充值后余额异常");
// ========== 转账模块 1-007-009-000 ========== // ========== 转账模块 1-007-009-000 ==========
ErrorCode PAY_TRANSFER_SUBMIT_CHANNEL_ERROR = new ErrorCode(1_007_009_000, "发起转账报错，错误码：{}，错误提示：{}"); ErrorCode PAY_TRANSFER_SUBMIT_CHANNEL_ERROR = new ErrorCode(1_007_009_000, "发起转账报错，错误码：{}，错误提示：{}");

3
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/wallet/PayWalletBizTypeEnum.java
View File

@ -18,7 +18,8 @@ public enum PayWalletBizTypeEnum implements IntArrayValuable {
RECHARGE(1, "充值"), RECHARGE(1, "充值"),
RECHARGE_REFUND(2, "充值退款"), RECHARGE_REFUND(2, "充值退款"),
PAYMENT(3, "支付"), PAYMENT(3, "支付"),
PAYMENT_REFUND(4, "支付退款"); PAYMENT_REFUND(4, "支付退款"),
ADMIN_MODIFY(5, "管理员修改");
// TODO 后续增加 // TODO 后续增加

2
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletController.java
View File

@ -42,7 +42,7 @@ public class PayWalletController {
@PostMapping("/update") @PostMapping("/update")
@PreAuthorize("@ss.hasPermission('pay:wallet:update')") @PreAuthorize("@ss.hasPermission('pay:wallet:update')")
@Operation(summary = "修改用户钱包余额") @Operation(summary = "修改用户钱包余额（后台操作）")
public CommonResult<Boolean> updateWallet(@Valid @RequestBody PayWalletUserBalanceVo reqVo){ public CommonResult<Boolean> updateWallet(@Valid @RequestBody PayWalletUserBalanceVo reqVo){
payWalletService.updateWallet(reqVo); payWalletService.updateWallet(reqVo);
return success(true); return success(true);

2
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletService.java
View File

@ -99,7 +99,7 @@ public interface PayWalletService {
void unfreezePrice(Long id, Integer price); void unfreezePrice(Long id, Integer price);
/** /**
* 修改钱包余额 * 修改钱包余额（后台操作）
* @param reqVo * @param reqVo
* @return void * @return void
*/ */

34
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
View File

@ -35,7 +35,7 @@ import static cn.iocoder.yudao.module.pay.enums.wallet.PayWalletBizTypeEnum.PAYM
*/ */
@Service @Service
@Slf4j @Slf4j
public class PayWalletServiceImpl implements PayWalletService { public class PayWalletServiceImpl implements PayWalletService {
@Resource @Resource
private PayWalletMapper walletMapper; private PayWalletMapper walletMapper;
@ -105,7 +105,7 @@ public class PayWalletServiceImpl implements PayWalletService {
/** /**
* 校验是否能退款 * 校验是否能退款
* *
* @param refundId 支付退款单 id * @param refundId 支付退款单 id
* @param walletPayNo 钱包支付 no * @param walletPayNo 钱包支付 no
*/ */
private Long validateWalletCanRefund(Long refundId, String walletPayNo) { private Long validateWalletCanRefund(Long refundId, String walletPayNo) {
@ -210,17 +210,35 @@ public class PayWalletServiceImpl implements PayWalletService {
@Override @Override
public void updateWallet(PayWalletUserBalanceVo reqVo) { public void updateWallet(PayWalletUserBalanceVo reqVo) {
if(reqVo.getBalance().compareTo(BigDecimal.ZERO) == 0){ // 如果
if (reqVo.getBalance().compareTo(BigDecimal.ZERO) == 0) {
return; return;
} }
// 把单位从元转为分
BigDecimal change = new BigDecimal("100"); BigDecimal change = new BigDecimal("100");
// 查出对应钱包信息
PayWalletDO walletDO = walletMapper.selectById(reqVo.getId()); PayWalletDO walletDO = walletMapper.selectById(reqVo.getId());
int changeBalance = (reqVo.getBalance().multiply(change)).intValue(); if (reqVo.getBalance().compareTo(new BigDecimal("21474836.47")) > 0) {
int totalBalance = walletDO.getBalance() + changeBalance; throw exception(WALLET_RECHARGE_RANGE_EXCEPTION);
int totalRecharge = walletDO.getTotalRecharge() + changeBalance; }
walletDO.setBalance(totalBalance); // 总共改变的金额
walletDO.setTotalRecharge(totalRecharge); long changeBalance = (reqVo.getBalance().multiply(change)).longValue();
// 总余额
long totalBalance = walletDO.getBalance() + changeBalance;
// 总充值
long totalRecharge = walletDO.getTotalRecharge() + changeBalance;
if (totalBalance > 2147483647 || totalRecharge > 2147483647 || totalBalance < 0 || totalRecharge < 0) {
throw exception(WALLET_RECHARGE_RANGE_EXCEPTION);
}
walletDO.setBalance((int) totalBalance);
walletDO.setTotalRecharge((int) totalRecharge);
walletMapper.updateById(walletDO); walletMapper.updateById(walletDO);
String title = "后台操作给用户" + (totalBalance > 0 ? "增加" : "减少") + "余额" + Math.abs(changeBalance)/100.0 + "元";
WalletTransactionCreateReqBO transactionCreateReqBO = new WalletTransactionCreateReqBO()
.setWalletId(reqVo.getId()).setPrice((int) changeBalance).setBalance((int) totalBalance)
.setBizType(PayWalletBizTypeEnum.ADMIN_MODIFY.getType()).setBizId("0").setTitle(title);
walletTransactionService.createWalletTransaction(transactionCreateReqBO);
} }
} }