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

查询问题

Browse Source
This commit is contained in:
wangw
2025-12-18 14:10:44 +08:00
parent af3abe6dfb
commit 6547768b34
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java
View File

@@ -34,7 +34,7 @@ public class SysRoleTemplateServiceImpl extends ServiceImpl<SysRoleTemplateMappe
SysRoleTemplate roleTemplate = BeanUtil.copyProperties(dto, SysRoleTemplate.class, "roleIdList"); SysRoleTemplate roleTemplate = BeanUtil.copyProperties(dto, SysRoleTemplate.class, "roleIdList");
roleTemplate.setOpUser(StpKit.USER.getAccount()); roleTemplate.setOpUser(StpKit.USER.getAccount());
if (roleTemplate.getPid() != null) { if (roleTemplate.getPid() != null) {
SysRole sysRole = new SysRole().setName(roleTemplate.getName()).setCreateUserId(StpKit.USER.getLoginIdAsLong()); SysRole sysRole = new SysRole().setName(roleTemplate.getName()).setCreateUserId(StpKit.USER.getShopId());
roleService.save(sysRole); roleService.save(sysRole);
roleTemplate.setRoleId(sysRole.getId()); roleTemplate.setRoleId(sysRole.getId());
} }

5
cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java
View File

@@ -6,6 +6,7 @@ import com.czg.order.vo.GbOrderDetailVO;
import com.czg.order.vo.GbOrderUserVO; import com.czg.order.vo.GbOrderUserVO;
import com.mybatisflex.core.BaseMapper; import com.mybatisflex.core.BaseMapper;
import com.czg.order.entity.GbOrder; import com.czg.order.entity.GbOrder;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@@ -17,9 +18,9 @@ import java.util.List;
*/ */
public interface GbOrderMapper extends BaseMapper<GbOrder> { public interface GbOrderMapper extends BaseMapper<GbOrder> {
GbOrderCountVO countOrder(GbOrderQueryParam param); GbOrderCountVO countOrder(@Param("param") GbOrderQueryParam param);
List<GbOrderDetailVO> getGbOrderPage(GbOrderQueryParam param, Long shopId, Long mainShopId); List<GbOrderDetailVO> getGbOrderPage(@Param("param")GbOrderQueryParam param, Long shopId, Long mainShopId);
GbOrderDetailVO getDetailByDetailId(Long mainShopId, Long shopId, Long detailId); GbOrderDetailVO getDetailByDetailId(Long mainShopId, Long shopId, Long detailId);

13
cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
View File

@@ -20,13 +20,11 @@
<if test="param.groupOrderNo != null"> <if test="param.groupOrderNo != null">
AND detail.group_order_no = #{param.groupOrderNo} AND detail.group_order_no = #{param.groupOrderNo}
</if> </if>
<if test="param.status != null"> <if test='param.status == "退款"'>
<if test="param.status == '退款'"> AND (detail.STATUS = '退款中' or detail.STATUS = '已退款')
AND (detail.STATUS = '退款中' or detail.STATUS = '已退款') </if>
</if> <if test='param.status != "退款"'>
<if test="param.status != '退款'"> AND detail.STATUS = #{param.status}
AND detail.STATUS = #{param.status}
</if>
</if> </if>
<if test="param.userId != null"> <if test="param.userId != null">
AND detail.user_id = #{param.userId} AND detail.user_id = #{param.userId}
@@ -37,7 +35,6 @@
<if test="param.verifyStartTime != null and param.verifyEndTime != null "> <if test="param.verifyStartTime != null and param.verifyEndTime != null ">
and detail.verify_time BETWEEN #{param.verifyStartTime} and #{param.verifyEndTime} and detail.verify_time BETWEEN #{param.verifyStartTime} and #{param.verifyEndTime}
</if> </if>
order by detail.create_time desc
</select> </select>
<select id="getGbOrderPage" resultType="com.czg.order.vo.GbOrderDetailVO"> <select id="getGbOrderPage" resultType="com.czg.order.vo.GbOrderDetailVO">