czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
wangw
2025-12-22 10:24:45 +08:00
parent 102ee912a9 931b7805fe
commit f1b91cf536
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java
View File

@@ -108,6 +108,7 @@ public class PpPackageOrderServiceImpl extends ServiceImpl<PpPackageOrderMapper,
}
PpPackage aPackage = ppPackageService.getById(order.getPackageId());
aPackage.setShopId(order.getShopId());
orderDto.setPackageInfo(ppPackageService.convertPackageToVo(aPackage));
return orderDto;

13
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.czg.service.market.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSONArray;
import com.czg.account.entity.ShopConfig;
import com.czg.account.entity.ShopInfo;
@@ -163,10 +164,16 @@ public class PpPackageServiceImpl extends ServiceImpl<PpPackageMapper, PpPackage
Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
QueryWrapper queryWrapper = new QueryWrapper();
if (!isAdmin) {
queryWrapper.eq(PpPackage::getOnlineStatus, SystemConstants.OneZero.ONE);
}
queryWrapper.eq(PpPackage::getIsDel, SystemConstants.OneZero.ZERO)
.eq(PpPackage::getOnlineStatus, reqVo.getOnlineStatus())
.like(PpPackage::getPackageName, reqVo.getPackageName())
.orderBy(PpPackage::getCreateTime).desc();
.eq(PpPackage::getOnlineStatus, reqVo.getOnlineStatus());
if (StrUtil.isNotBlank(reqVo.getPackageName())) {
queryWrapper.like(PpPackage::getPackageName, reqVo.getPackageName());
}
queryWrapper.orderBy(PpPackage::getCreateTime).desc();
queryWrapper.and(q -> {
q.eq(PpPackage::getShopId, shopId).or(q1 -> {

4
cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml
View File

@@ -17,10 +17,10 @@
left join tb_user_info u on o.user_id = u.id
where 1=1
<if test="shopId != null">
and o.shop_id = #{shopId} and o.status != 'ing'
and o.shop_id = #{shopId}
</if>
<if test="userId != null">
and o.user_id = #{userId}
and o.user_id = #{userId} and o.status != 'ing'
</if>
<if test="param.orderNo != null">
and o.order_no = #{param.orderNo}