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:
N 2024-01-28 18:55:43 +08:00
parent 0e40832516
commit 285616700b
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
View File

@ -184,6 +184,7 @@ public class FyPayServiceImpl implements FyPayService {
// 油品订单 // 油品订单
oilOrder.setOrderStatus("paid"); oilOrder.setOrderStatus("paid");
oilOrder.setPayTime(date); oilOrder.setPayTime(date);
oilOrderService.updateCardAndActiveById(oilOrder.getStoreId(),oilOrder.getUserId(),oilOrder.getActiveId(),oilOrder.getCouponId(),oilOrder.getActiveType(),oilOrder.getOrderAmount(), Integer.valueOf(oilOrder.getOils()));
staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),oilOrder.getOilNum(),"1",orderNo); staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),oilOrder.getOilNum(),"1",orderNo);
// 修改油罐容量 // 修改油罐容量
List<JSONObject> jsonObjects = JSONArray.parseArray(map1.get("oilOrder"), JSONObject.class); List<JSONObject> jsonObjects = JSONArray.parseArray(map1.get("oilOrder"), JSONObject.class);
@ -253,6 +254,9 @@ public class FyPayServiceImpl implements FyPayService {
order.setOrderStatus("paid"); order.setOrderStatus("paid");
order.setPayTime(date); order.setPayTime(date);
oilOrderService.updateOilOrder(order); oilOrderService.updateOilOrder(order);
oilOrderService.updateCardAndActiveById(order.getStoreId(),order.getUserId(),order.getActiveId(),order.getCouponId(),order.getActiveType(),order.getOrderAmount(), Integer.valueOf(order.getOils()));
// 修改油罐容量 // 修改油罐容量
List<JSONObject> jsonObjects = JSONArray.parseArray(map1.get("oilOrder"), JSONObject.class); List<JSONObject> jsonObjects = JSONArray.parseArray(map1.get("oilOrder"), JSONObject.class);
for (JSONObject jsonObject : jsonObjects) { for (JSONObject jsonObject : jsonObjects) {

2
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
View File

@ -119,9 +119,9 @@ public class OilConfigServiceImpl extends ServiceImpl<OilConfigMapper, OilConfig
@Override @Override
public int insertOilConfig(OilConfigVo oilConfig) { public int insertOilConfig(OilConfigVo oilConfig) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = null; Integer storeId = null;
if (oilConfig.getStoreId()==null){ if (oilConfig.getStoreId()==null){
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
storeId = nowAccountInfo.getStoreId(); storeId = nowAccountInfo.getStoreId();
}else { }else {
storeId = oilConfig.getStoreId(); storeId = oilConfig.getStoreId();

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java
View File

@ -48,6 +48,10 @@ public class OilOrder extends BaseEntity implements Serializable {
* 活动id * 活动id
*/ */
private Integer activeId; private Integer activeId;
/**
* 活动类型
*/
private String activeType;
/** /**
* 提成金额 * 提成金额
*/ */

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

@ -374,10 +374,11 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setTankId(Integer.valueOf(jsonObjects.get(0).get("tankId").toString())); order.setTankId(Integer.valueOf(jsonObjects.get(0).get("tankId").toString()));
order.setActiveId(Integer.valueOf(jsonObjects.get(i).get("activeId").toString())); order.setActiveId(Integer.valueOf(jsonObjects.get(i).get("activeId").toString()));
order.setCouponId(Integer.valueOf(jsonObjects.get(i).get("cardFavorableId").toString())); order.setCouponId(Integer.valueOf(jsonObjects.get(i).get("cardFavorableId").toString()));
order.setActiveType(jsonObjects.get(i).get("type").toString());
if (payType.equals("CASH")){ if (payType.equals("CASH")){
order.setPayTime(new Date()); order.setPayTime(new Date());
this.addOilTrack(jsonObjects.get(i),storeId); this.addOilTrack(jsonObjects.get(i),storeId);
this.updateCardAndActiveById(storeId,userId,order.getActiveId(),order.getCouponId(),jsonObjects.get(i).get("type").toString(),order.getOrderAmount(), Integer.valueOf(order.getOils())); this.updateCardAndActiveById(storeId,userId,order.getActiveId(),order.getCouponId(),order.getActiveType(),order.getOrderAmount(), Integer.valueOf(order.getOils()));
} }
if (map.get("allAmount").equals("0")){ if (map.get("allAmount").equals("0")){
order.setPayTime(new Date()); order.setPayTime(new Date());