dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-04-02 17:24:30 +08:00
commit d5e1754285
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/staff/list.vue
View File

@ -327,7 +327,7 @@
厂商名称 厂商名称
</div> </div>
<div class="rw"> <div class="rw">
二维码SN号 二维码ID
</div> </div>
<div class="rw"> <div class="rw">
码牌SN号 码牌SN号

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
View File

@ -223,6 +223,8 @@
FROM FROM
oil_order oil_order
WHERE WHERE
order_status = 'paid'
and
store_id = #{storeId} store_id = #{storeId}
) oil_order ON date_range.date = oil_order.order_date ) oil_order ON date_range.date = oil_order.order_date
WHERE WHERE

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -1743,8 +1743,8 @@ return stringDoubleMap;
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId(); Integer storeId = nowAccountInfo.getStoreId();
List<Map<String, String>> maps = oilOrderMapper.oilSales(storeId);
return oilOrderMapper.oilSales(storeId); return maps;
} }
@Resource @Resource

17
fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java
View File

@ -25,6 +25,8 @@ import com.fuint.framework.web.ResponseObject;
import com.fuint.module.backendApi.response.LoginResponse; import com.fuint.module.backendApi.response.LoginResponse;
import com.fuint.repository.model.TAccount; import com.fuint.repository.model.TAccount;
import com.fuint.repository.model.TDutySource; import com.fuint.repository.model.TDutySource;
import com.fuint.system.dept.entity.SysDept;
import com.fuint.system.dept.service.ISysDeptService;
import com.fuint.system.role.entity.TDuty; import com.fuint.system.role.entity.TDuty;
import com.fuint.repository.model.TSource; import com.fuint.repository.model.TSource;
import com.fuint.system.role.service.DutyService; import com.fuint.system.role.service.DutyService;
@ -91,6 +93,9 @@ public class BackendLoginController extends BaseController {
@Resource @Resource
private LJDutyMapper ljDutyMapper; private LJDutyMapper ljDutyMapper;
@Resource
private ISysDeptService iSysDeptService;
/** /**
* 后台登录 * 后台登录
@ -165,6 +170,18 @@ public class BackendLoginController extends BaseController {
return getFailureResult(201,"请登录油站端！"); return getFailureResult(201,"请登录油站端！");
} }
LambdaQueryWrapper<SysDept> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(SysDept::getDeptId,one.getDeptId());
SysDept one1 = iSysDeptService.getOne(queryWrapper1);
if (ObjectUtils.isNotEmpty(one1) && ObjectUtils.isNotEmpty(one1.getTurnoverType()) && one1.getTurnoverType().equals("2")){
if (ObjectUtils.isNotEmpty(one1.getTurnoverEndTime())){
Date date = new Date();
Date turnoverEndTime = one1.getTurnoverEndTime();
if (date.compareTo(turnoverEndTime)<0){
return getFailureResult(201,"请付费后再登录！");
}
}
}
//不知道是哪个平台过来的请求 //不知道是哪个平台过来的请求
/*LambdaQueryWrapper<TAccount> queryWrapper = new LambdaQueryWrapper<>(); /*LambdaQueryWrapper<TAccount> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TAccount::getAccountName, accountName); queryWrapper.eq(TAccount::getAccountName, accountName);