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-06-12 16:29:35 +08:00
commit e6d42baa84
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1479,11 +1479,13 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
oilOrder.setUserId(nowAccountInfo.getId()); oilOrder.setUserId(nowAccountInfo.getId());
oilOrder.setOilTagSn(oilOrder.getOilTagSn()); oilOrder.setOilTagSn(oilOrder.getOilTagSn());
TagCode tagCode = tagCodeService.selectByTagCodeSn(oilOrder.getOilTagSn()); TagCode tagCode = tagCodeService.selectByTagCodeSn(oilOrder.getOilTagSn());
if (ObjectUtil.isNotEmpty(tagCode)) {
String collection = tagCode.getCollection(); String collection = tagCode.getCollection();
if (collection.contains("staffId")) { if (collection.contains("staffId")) {
String[] split = collection.split("staffId="); String[] split = collection.split("staffId=");
oilOrder.setStaffId(Integer.parseInt(split[1])); oilOrder.setStaffId(Integer.parseInt(split[1]));
} }
}
// 判断当前店铺是否存在此用户的会员信息，没有的话进行添加 // 判断当前店铺是否存在此用户的会员信息，没有的话进行添加
LJStore store = storeService.selectStoreByStoreId(oilOrder.getStoreId()); LJStore store = storeService.selectStoreByStoreId(oilOrder.getStoreId());
UserBalance balance = userBalanceService.selectUserBalance(oilOrder.getUserId(), store.getChainStoreId()); UserBalance balance = userBalanceService.selectUserBalance(oilOrder.getUserId(), store.getChainStoreId());