czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

交班打印逻辑修改

Browse Source
This commit is contained in:
19991905653
2024-04-12 10:27:51 +08:00
parent c3c169d2b5
commit a2432316ea
6 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/chaozhanggui/system/cashierservice/controller/CloudPrinterController.java
View File

@@ -50,8 +50,9 @@ public class CloudPrinterController {
public Result handoverPrint( @RequestHeader("token") String token, public Result handoverPrint( @RequestHeader("token") String token,
@RequestHeader("loginName") String loginName, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestHeader("clientType") String clientType,
@RequestParam("tradeDay") String tradeDay @RequestParam("tradeDay") String tradeDay,
Integer id
){ ){
return cloudPrinterService.handoverprintData(token,tradeDay,loginName); return cloudPrinterService.handoverprintData(token,id,loginName);
} }
} }

2
src/main/java/com/chaozhanggui/system/cashierservice/dao/ShopUserDutyMapper.java
View File

@@ -40,5 +40,7 @@ public interface ShopUserDutyMapper {
ShopUserDuty selectByShopIdAndDay(@Param("shopId") Integer shopId,@Param("day") String day); ShopUserDuty selectByShopIdAndDay(@Param("shopId") Integer shopId,@Param("day") String day);
void updateStatusById(@Param("id") Integer id, @Param("staffId") Integer staffId);
// List<String> selectByShopIdAndTradeAll(@Param("shopId") Integer shopId,@Param("day") String day,@Param("tokenId") Integer tokenId); // List<String> selectByShopIdAndTradeAll(@Param("shopId") Integer shopId,@Param("day") String day,@Param("tokenId") Integer tokenId);
} }

5
src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java
View File

@@ -514,7 +514,7 @@ public class CloudPrinterService {
} }
public Result handoverprintData(String token,String tradeDay,String loginName){ public Result handoverprintData(String token,Integer id,String loginName){
JSONObject info= TokenUtil.parseParamFromToken(token); JSONObject info= TokenUtil.parseParamFromToken(token);
@@ -558,7 +558,8 @@ public class CloudPrinterService {
return; return;
} }
ShopUserDuty shopUserDuty=shopUserDutyMapper.selectByShopIdAndDay(tbShopInfo.getId(),tradeDay); ShopUserDuty shopUserDuty=shopUserDutyMapper.selectByPrimaryKey(id);
// ShopUserDuty shopUserDuty=shopUserDutyMapper.selectByShopIdAndDay(tbShopInfo.getId(),tradeDay);
MsgException.checkNull(shopUserDuty,"交班信息不存在"); MsgException.checkNull(shopUserDuty,"交班信息不存在");

6
src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java
View File

@@ -278,8 +278,10 @@ public class DutyService {
JSONObject tokenJson = TokenUtil.parseParamFromToken(tbToken.getToken()); JSONObject tokenJson = TokenUtil.parseParamFromToken(tbToken.getToken());
Integer shopId = tokenJson.getInteger("shopId"); Integer shopId = tokenJson.getInteger("shopId");
Integer staffId = tokenJson.getInteger("staffId"); Integer staffId = tokenJson.getInteger("staffId");
cloudPrinterService.handoverprintData(token, day, ""); ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndStatus(shopId, "0");
shopUserDutyMapper.updateStatusByTokenId(day, shopId, staffId); cloudPrinterService.handoverprintData(token, shopUserDuty.getId(), "");
// shopUserDutyMapper.updateStatusByTokenId(day, shopId, staffId);
shopUserDutyMapper.updateStatusById(shopUserDuty.getId(),staffId);
} }
} }
} catch (Exception e) { } catch (Exception e) {

3
src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java
View File

@@ -60,7 +60,8 @@ public class ShopInfoService {
Integer shopId = jsonObject.getInteger("shopId"); Integer shopId = jsonObject.getInteger("shopId");
String day = DateUtils.getDay(); String day = DateUtils.getDay();
// ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByTokenId(tbToken.getId()); // ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByTokenId(tbToken.getId());
ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndTrade(shopId,day); ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndStatus(shopId,"0");
// ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndTrade(shopId,day);
// List<String> list = shopUserDutyMapper.selectByShopIdAndTradeAll(shopId,day,tbToken.getId()); // List<String> list = shopUserDutyMapper.selectByShopIdAndTradeAll(shopId,day,tbToken.getId());
if (Objects.nonNull(shopUserDuty)){ if (Objects.nonNull(shopUserDuty)){
// PageHelper.startPage(page, pageSize); // PageHelper.startPage(page, pageSize);

3
src/main/resources/mapper/ShopUserDutyMapper.xml
View File

@@ -224,6 +224,9 @@
<update id="updateStatusByTokenId"> <update id="updateStatusByTokenId">
update tb_shop_user_duty set status = '1' , login_out_time = now(),user_id = #{staffId} where shop_id = #{shopId} and trade_day = #{day} and status = '0' update tb_shop_user_duty set status = '1' , login_out_time = now(),user_id = #{staffId} where shop_id = #{shopId} and trade_day = #{day} and status = '0'
</update> </update>
<update id="updateStatusById">
update tb_shop_user_duty set status = '1' , login_out_time = now(),user_id = #{staffId} where id = #{id}
</update>
<select id="selectByShopIdAndDay" resultMap="BaseResultMap"> <select id="selectByShopIdAndDay" resultMap="BaseResultMap">
select * from tb_shop_user_duty where trade_day = #{day} and shop_id = #{shopId} order by id desc limit 1 select * from tb_shop_user_duty where trade_day = #{day} and shop_id = #{shopId} order by id desc limit 1