Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e6d42baa84
@ -1479,10 +1479,12 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
|
||||
oilOrder.setUserId(nowAccountInfo.getId());
|
||||
oilOrder.setOilTagSn(oilOrder.getOilTagSn());
|
||||
TagCode tagCode = tagCodeService.selectByTagCodeSn(oilOrder.getOilTagSn());
|
||||
String collection = tagCode.getCollection();
|
||||
if (collection.contains("staffId")){
|
||||
String[] split = collection.split("staffId=");
|
||||
oilOrder.setStaffId(Integer.parseInt(split[1]));
|
||||
if (ObjectUtil.isNotEmpty(tagCode)) {
|
||||
String collection = tagCode.getCollection();
|
||||
if (collection.contains("staffId")) {
|
||||
String[] split = collection.split("staffId=");
|
||||
oilOrder.setStaffId(Integer.parseInt(split[1]));
|
||||
}
|
||||
}
|
||||
// 判断当前店铺是否存在此用户的会员信息,没有的话进行添加
|
||||
LJStore store = storeService.selectStoreByStoreId(oilOrder.getStoreId());
|
||||
|
Loading…
Reference in New Issue
Block a user