修改交班落地数据逻辑
This commit is contained in:
@@ -25,7 +25,7 @@ public interface ShopUserDutyMapper {
|
||||
|
||||
ShopUserDuty selectByTokenId(@Param("tokenId") Integer tokenId);
|
||||
|
||||
void updateStatusByTokenId(@Param("tokenId") Integer tokenId);
|
||||
void updateStatusByTokenId(@Param("day") String day,@Param("shopId") Integer shopId);
|
||||
|
||||
List<ShopUserDuty> selectByShopId(@Param("shopId") String shopId);
|
||||
|
||||
|
||||
@@ -51,6 +51,7 @@ public class DutyService {
|
||||
String type = jsonObject.getString("type");
|
||||
TbToken tbToken = tbTokenMapper.selectByToken(token);
|
||||
String day = DateUtils.getDay();
|
||||
Integer shop = 0;
|
||||
if (type.equals("return") || type.equals("create")) {
|
||||
if (Objects.isNull(tbToken)) {
|
||||
throw new MsgException("当前用户不存在");
|
||||
@@ -59,6 +60,7 @@ public class DutyService {
|
||||
Integer orderId = jsonObject.getInteger("orderId");
|
||||
JSONObject tokenJson = TokenUtil.parseParamFromToken(tbToken.getToken());
|
||||
Integer shopId = tokenJson.getInteger("shopId");
|
||||
shop = shopId;
|
||||
Integer userId = tokenJson.getInteger("staffId");
|
||||
String loginName = tokenJson.getString("loginName");
|
||||
TbOrderInfo orderInfo = orderInfoMapper.selectByPrimaryKey(orderId);
|
||||
@@ -262,7 +264,7 @@ public class DutyService {
|
||||
}
|
||||
}else{
|
||||
if (type.equals("close")){
|
||||
shopUserDutyMapper.updateStatusByTokenId(tbToken.getId());
|
||||
shopUserDutyMapper.updateStatusByTokenId(day,shop);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
</select>
|
||||
<select id="selectByShopIdAndTrade"
|
||||
resultType="com.chaozhanggui.system.cashierservice.entity.ShopUserDuty">
|
||||
select * from tb_shop_user_duty where trade_day = #{day} and shop_id = #{shopId}
|
||||
select * from tb_shop_user_duty where trade_day = #{day} and shop_id = #{shopId} and status = '0'
|
||||
</select>
|
||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
|
||||
delete from tb_shop_user_duty
|
||||
@@ -222,6 +222,6 @@
|
||||
where id = #{id,jdbcType=INTEGER}
|
||||
</update>
|
||||
<update id="updateStatusByTokenId">
|
||||
update tb_shop_user_duty set status = '1' and login_out_time = now() where token_id = #{tokenId}
|
||||
update tb_shop_user_duty set status = '1' , login_out_time = now() where shop_id = #{shopId} and trade_day = #{day}
|
||||
</update>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user