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

收银点bug修复

Browse Source
This commit is contained in:
19991905653
2024-02-29 13:43:22 +08:00
parent 9c2ef00db1
commit 5d1024ee3f
8 changed files with 131 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockMapper.java
View File

@@ -63,7 +63,7 @@ public interface DeviceStockMapper extends BaseMapper<DeviceStock> {
DeviceStock getDeviceBySnNo(String snNo);
Page<DeviceStockVO> pageDeviceStock(Page<DeviceStockVO> page, @Param("userId") Long userId, @Param("cashPlaceId") Long cashPlaceId);
Page<DeviceStockVO> pageDeviceStock(Page<DeviceStockVO> page,@Param("cashPlaceId") Long cashPlaceId);
@Select("SELECT * FROM tb_pluss_device_stock where deviceNo = #{deviceNo} limit 1")
DeviceStock getDeviceByDeviceNo(@Param("deviceNo") String deviceNo);

28
pluss-dao-bundle/src/main/resources/mapper/DeviceStockMapper.xml
View File

@@ -205,20 +205,20 @@
<select id="pageDeviceStock" resultType="cn.pluss.platform.vo.DeviceStockVO">
SELECT ds.*, dt.`name` deviceName, spec.specName typeDesc, dg.deviceLogo, dt.payCodeFlag, mcp.name cashPlaceName
FROM tb_pluss_device_stock ds
LEFT JOIN tb_pluss_merchant_base_info mbi ON ds.actMercId = mbi.id
LEFT JOIN tb_pluss_device_type dt ON dt.`code` = ds.`code`
LEFT JOIN tb_pluss_device_spec spec ON ds.`code` = spec.`code` AND ds.type = spec.spec
LEFT JOIN tb_pluss_merchant_cash_pay_code mcpc ON mcpc.payCode = ds.snNo
LEFT JOIN tb_pluss_merchant_cash_place mcp ON mcpc.cashPlaceId = mcp.id
LEFT JOIN tb_pluss_device_goods dg ON dg.`code` = ds.`code`
<where>
<if test="userId != null">
AND mbi.userId = #{userId}
</if>
<if test="cashPlaceId != null">
AND mcpc.cashPlaceId = #{cashPlaceId}
</if>
</where>
left JOIN tb_pluss_device_type dt ON dt.`code` = ds.`code`
left JOIN tb_pluss_device_spec spec ON ds.`code` = spec.`code` AND ds.type = spec.spec
left JOIN tb_pluss_merchant_cash_pay_code mcpc ON mcpc.payCode = ds.snNo
left JOIN tb_pluss_merchant_cash_place mcp ON mcp.id = mcpc.cashPlaceId
left JOIN tb_pluss_device_goods dg ON dg.`code` = ds.`code`
where mcpc.cashPlaceId = #{cashPlaceId}
<!-- <where>-->
<!-- <if test="userId != null">-->
<!-- AND mbi.userId = #{userId}-->
<!-- </if>-->
<!-- <if test="cashPlaceId != null">-->
<!-- AND mcpc.cashPlaceId = #{cashPlaceId}-->
<!-- </if>-->
<!-- </where>-->
</select>
</mapper>