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

bug

Browse Source
This commit is contained in:
齐天大圣 2024-03-27 14:07:27 +08:00
parent 7be624df45
commit ee190fdc01
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,7 @@ import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.StringUtils; import com.fuint.common.util.StringUtils;
import com.fuint.common.util.TokenUtil; import com.fuint.common.util.TokenUtil;
import com.fuint.system.config.service.SysConfigService; import com.fuint.system.config.service.SysConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -80,6 +81,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@Service @Service
@Slf4j
public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> implements OilOrderService { public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> implements OilOrderService {
@Autowired @Autowired
private LJOrderService orderService; private LJOrderService orderService;
@ -123,6 +125,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
private ActiveDiscountService activeDiscountService; private ActiveDiscountService activeDiscountService;
@Resource @Resource
private IntegralSettingsService integralSettingsService; private IntegralSettingsService integralSettingsService;
@Resource
private OilGunService oilGunService;
@Override @Override
public IPage<OilOrder> selectOilOrderList(Page page, OilOrder order) { public IPage<OilOrder> selectOilOrderList(Page page, OilOrder order) {
@ -1080,10 +1084,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
oilOrder.setOrderType("主订单"); oilOrder.setOrderType("主订单");
oilOrder.setInvoicing("未开票"); oilOrder.setInvoicing("未开票");
oilOrder.setUserId(nowAccountInfo.getId()); oilOrder.setUserId(nowAccountInfo.getId());
if (ObjectUtils.isNotEmpty(oilOrder.getOilTagSn())){ oilOrder.setOilTagSn(oilOrder.getOilTagSn());
String[] split = oilOrder.getOilTagSn().split("=");
oilOrder.setOilTagSn(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());
@ -1346,7 +1347,18 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
} }
String oils = oilOrder.getOils(); String oils = oilOrder.getOils();
OilName oilName = oilNameService.getById(oils); OilName oilName = oilNameService.getById(oils);
content = oilOrder.getOilGunNum()+"加油"+oilName.getOilName()+oilName.getOilType()+oilOrder.getOilNum()+"升，共计"+oilOrder.getPayAmount()+"元"; //油枪名字
OilGun oilGun = oilGunService.queryById(Integer.parseInt(oilOrder.getOilGunNum()));
String oilName11 = "";
if (oilName.getOilName().contains("#")){
String[] split = oilName.getOilName().split("#");
oilName11 = split[0];
content = oilGun.getGunName()+"加油"+oilName11+oilName.getOilType()+oilOrder.getOilNum()+"升，共计"+oilOrder.getPayAmount()+"元";
}else {
content = oilGun.getGunName()+"加油"+oilName.getOilName()+oilName.getOilType()+oilOrder.getOilNum()+"升，共计"+oilOrder.getPayAmount()+"元";
}
log.info("码牌播报内容111："+content);
hashMap.put("content",content); hashMap.put("content",content);
tagUtils.voiceBroadcast(hashMap); tagUtils.voiceBroadcast(hashMap);
//tagUtils //tagUtils
@ -1873,9 +1885,6 @@ return stringDoubleMap;
saleDetailService.insertSaleDetail(saleDetail,isMember); saleDetailService.insertSaleDetail(saleDetail,isMember);
} }
@Resource
OilGunService oilGunService;
@Override @Override
public OilOrderVo getInfoByTime(Date time,Integer tankId) { public OilOrderVo getInfoByTime(Date time,Integer tankId) {
List<OilGun> oilGuns = oilGunService.selectOilGunByTankId(tankId); List<OilGun> oilGuns = oilGunService.selectOilGunByTankId(tankId);