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

修改交班

This commit is contained in:
牛叉闪闪 2024-07-31 14:13:30 +08:00
parent 8a0589e384
commit 8a51ed732e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
View File

@ -21,6 +21,8 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import static com.chaozhanggui.system.cashierservice.sign.CodeEnum.USERNOLOGIN;
@Service @Service
@Slf4j @Slf4j
public class DataService { public class DataService {
@ -49,6 +51,9 @@ public class DataService {
@Autowired @Autowired
tbHandoverMapper tbHandoverMapper; tbHandoverMapper tbHandoverMapper;
@Autowired
TbTokenMapper tbTokenMapper;
public Result handoverprintData(String token, Integer id){ public Result handoverprintData(String token, Integer id){
@ -56,6 +61,15 @@ public class DataService {
JSONObject info= TokenUtil.parseParamFromToken(token); JSONObject info= TokenUtil.parseParamFromToken(token);
MsgException.checkNull(info,"获取信息失败"); MsgException.checkNull(info,"获取信息失败");
TbToken tbToken = tbTokenMapper.selectByToken(token);
if (ObjectUtil.isEmpty(tbToken)) {
return Result.fail(USERNOLOGIN);
}
TbmerchantAccount tbmerchantAccount= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(info.get("accountId").toString())); TbmerchantAccount tbmerchantAccount= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(info.get("accountId").toString()));
MsgException.checkNull(tbmerchantAccount,"商户信息不存在"); MsgException.checkNull(tbmerchantAccount,"商户信息不存在");
@ -123,7 +137,7 @@ public class DataService {
return Result.success(CodeEnum.SUCCESS,handoverInfo); return Result.success(CodeEnum.SUCCESS,handoverInfo);
}else{ }else{
HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(), HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),
ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime())? DateUtils.getTime(shopUserDuty.getLoginTime()):null, ObjectUtil.isNotEmpty(tbToken.getCreateTime())? DateUtils.getTime(tbToken.getCreateTime()):null,
DateUtils.getTime(new Date()), DateUtils.getTime(new Date()),
ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(), ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(),
null,null,"0", null,null,"0",