From 418ec4a86358a9c7e2f2d557e7f97dabb31e5fd3 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Tue, 9 Jan 2024 11:26:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/fuyou/entity/ReceiveParameter.java | 2 +- .../fuyou/service/MerchantConfigService.java | 4 +- .../fuyou/service/impl/FyPayServiceImpl.java | 109 +++++++++++++++--- .../impl/MerchantConfigServiceImpl.java | 3 +- .../service/impl/OilConfigServiceImpl.java | 2 +- .../integral/mapper/IntegralOrdersMapper.java | 7 ++ .../mapper/xml/IntegralOrdersMapper.xml | 6 + .../service/IntegralOrdersService.java | 7 ++ .../impl/IntegralOrdersServiceImpl.java | 5 + .../business/order/entity/AllOrderInfo.java | 2 +- .../order/service/OrderGoodsService.java | 4 +- .../service/impl/OilOrderServiceImpl.java | 8 +- .../service/impl/OrderGoodsServiceImpl.java | 12 +- 13 files changed, 140 insertions(+), 31 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/ReceiveParameter.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/ReceiveParameter.java index 3c15b8a06..8b185b904 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/ReceiveParameter.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/ReceiveParameter.java @@ -12,7 +12,7 @@ public class ReceiveParameter { */ private String orderNo; /** - * 类型：1、油品；2、商品；3、储值卡；4、积分；5、囤油卡；6、油品加商品 + * 类型：1、油品；2、商品；3、储值卡；4、积分；5、囤油卡；6、油品加商品(收银台订单)；7、挂账订单 */ private String type; /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java index 2f6d88ae0..e32487b6b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java @@ -52,9 +52,9 @@ public interface MerchantConfigService extends IService { public MerchantConfig selectMerchById(int id); /** - * 将所有的使用1改为0 + * 将此店铺中所有的使用1改为0 */ - public void updateMerchOrter(); + public void updateMerchOrter(int store); /** * 修改商户使用状态 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index ffd8a5970..31bb09987 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -9,10 +9,13 @@ import com.fuint.api.fuyou.entity.*; import com.fuint.api.fuyou.service.FyPayService; import com.fuint.api.fuyou.service.MerchantConfigService; import com.fuint.api.fuyou.util.Utils; +import com.fuint.business.integral.entity.IntegralOrders; import com.fuint.business.integral.service.IntegralOrdersService; import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord; import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableRecordService; +import com.fuint.business.marketingActivity.cardFule.entity.CardFuelRecord; import com.fuint.business.marketingActivity.cardFule.service.CardFuelRecordService; +import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService; import com.fuint.business.order.entity.*; import com.fuint.business.order.service.*; @@ -68,14 +71,7 @@ public class FyPayServiceImpl implements FyPayService { map.put("ins_cd", insCd); map.put("mchnt_cd", mchntCd); map.put("goods_des", goodsDes); -// ReceiveParameter receiveParameter = new ReceiveParameter(); -// receiveParameter.setOrderNo(orderNo); -// receiveParameter.setType("油品订单"); -// receiveParameter.setContent(map1.get("goodsDes")); -// receiveParameter.setGoodsMoney(Double.valueOf(map1.get("allAmount"))); -// receiveParameter.setStoreId(oilOrder.getStoreId()); -// receiveParameter.setPayType(oilOrder.getPayType()); -// receiveParameter.setUserId(oilOrder.getUserId()); + // 请求报文 String reqBody = Message.requestMsg(map); @@ -87,7 +83,6 @@ public class FyPayServiceImpl implements FyPayService { String str = resMap.get("sign"); if (Utils.verifySign(resMap, str)){ -// this.insertAllOrderInfo(receiveParameter); ThreadUtil.execAsync(() -> { Timer timer = new Timer(); timer.schedule(new TimerTask() { @@ -125,7 +120,6 @@ public class FyPayServiceImpl implements FyPayService { @Override public Map queryOrder(Map map1) throws Exception { -// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); Map resMap =new HashMap<>(); resMap.put("msg","error"); try { @@ -144,10 +138,17 @@ public class FyPayServiceImpl implements FyPayService { // 余额新增 String type = ""; String payStates=""; + String payStatus="unpaid"; if (!ObjectUtil.isEmpty(map1.get("type"))) { type = map1.get("type"); } + ReceiveParameter receiveParameter = new ReceiveParameter(); + receiveParameter.setOrderNo(orderNo); + receiveParameter.setGoodsMoney(allAmount*100); + receiveParameter.setStoreId(storeId1); + receiveParameter.setPayType(payType); + // 请求报文 String reqBody = Message.requestMsg(map); // 响应报文 @@ -165,11 +166,12 @@ public class FyPayServiceImpl implements FyPayService { List returnRecords = returnRecordService.selectReturnRecordByOrderNo(orderNo); Date date = new Date(); if (reqMap.get("trans_stat").equals("SUCCESS")){ - merchantConfigService.updateMeChAmountByStoreId(storeId1,allAmount); + payStatus = "paid"; if (!ObjectUtil.isEmpty(oilOrder)){ // 油品订单 oilOrder.setOrderStatus("paid"); oilOrder.setPayTime(date); + // 修改油罐容量 List jsonObjects = JSONArray.parseArray(map1.get("oilOrder"), JSONObject.class); if (jsonObjects.size()<=1) { @@ -191,6 +193,7 @@ public class FyPayServiceImpl implements FyPayService { // 商品订单 goodsOrder.setStatus("paid"); goodsOrder.setPayTime(date); + if (!map1.get("goodsOrder").equals("[]")){ List goods = JSONArray.parseArray(map1.get("goodsOrder"), JSONObject.class); OrderGoods orderGoods = new OrderGoods(); @@ -198,7 +201,7 @@ public class FyPayServiceImpl implements FyPayService { orderGoods.setOrderId(goodsOrder.getId()); orderGoods.setGoodsId(Integer.valueOf(good.get("id").toString())); orderGoods.setNum(Integer.valueOf(good.get("num").toString())); - orderGoodsService.insertOrderGoods(orderGoods); + orderGoodsService.insertOrderGoods(orderGoods,storeId1); } } } @@ -216,6 +219,8 @@ public class FyPayServiceImpl implements FyPayService { hangBillService.updateHangBill(returnRecord.getHangBillId(), returnRecord.getAmount()); returnRecordService.updateReturnRecord(returnRecord); } + receiveParameter.setType("7"); + receiveParameter.setContent("挂账订单"); } if (!ArrayUtil.isEmpty(list)){ if (list.size()>1){ @@ -242,6 +247,10 @@ public class FyPayServiceImpl implements FyPayService { } if ("CVR".equals(type)) { payStates = "paid"; + receiveParameter.setType("2"); + if (goodsOrder.getUserId()!=null){ + receiveParameter.setUserId(goodsOrder.getUserId()); + } // if (!ObjectUtil.isEmpty(map1.get("orderId"))) { // // } @@ -260,6 +269,7 @@ public class FyPayServiceImpl implements FyPayService { }else if (reqMap.get("trans_stat").equals("USERPAYING")){ resMap.put("msg","unpaid"); }else { + payStatus = "payFail"; if (!ObjectUtil.isEmpty(oilOrder)){ oilOrder.setOrderStatus("payFail"); } @@ -275,6 +285,9 @@ public class FyPayServiceImpl implements FyPayService { returnRecord.setPayStatus("payFail"); returnRecordService.updateReturnRecord(returnRecord); } + + receiveParameter.setType("7"); + receiveParameter.setContent("挂账订单"); } if (!ArrayUtil.isEmpty(list)){ if (list.size()>1) { @@ -298,29 +311,77 @@ public class FyPayServiceImpl implements FyPayService { } } if (!ObjectUtil.isEmpty(oilOrder)){ + receiveParameter.setType("1"); + if (oilOrder.getUserId()!=null){ + receiveParameter.setUserId(oilOrder.getUserId()); + } + receiveParameter.setContent("油品订单"); + oilOrderService.updateOilOrder(oilOrder); } if (!ObjectUtil.isEmpty(goodsOrder)){ + receiveParameter.setType("2"); + if (goodsOrder.getUserId()!=null){ + receiveParameter.setUserId(goodsOrder.getUserId()); + } + receiveParameter.setContent("商品订单"); + goodsOrderService.updateGoodOrder(goodsOrder); } if (!ObjectUtil.isEmpty(cashierOrder)){ + receiveParameter.setType("6"); + if (!ObjectUtil.isEmpty(oilOrder)){ + if (oilOrder.getUserId()!=null){ + receiveParameter.setUserId(oilOrder.getUserId()); + } + } + if (!ObjectUtil.isEmpty(goodsOrder)){ + if (goodsOrder.getUserId()!=null){ + receiveParameter.setUserId(goodsOrder.getUserId()); + } + } + receiveParameter.setContent("收银台订单"); + cashierOrderService.updateCashierOrder(cashierOrder); } if ("CVR".equals(type) && !ObjectUtil.isEmpty(map1.get("orderId"))) { +// 储值卡 Integer id = Integer.parseInt(map1.get("orderId")); cardValueRecordService.editPayStatus(id, payStates); + + CardValueRecord byId = cardValueRecordService.getById(id); + receiveParameter.setType("3"); + if (byId.getMtUserId()!=null){ + receiveParameter.setUserId(byId.getMtUserId()); + } + receiveParameter.setContent("储值卡订单"); } if ("CFR".equals(type) && !ObjectUtil.isEmpty(map1.get("orderId"))) { - // 存油卡 +// 囤油卡 Integer id = Integer.parseInt(map1.get("orderId")); cardFuelRecordService.editPayStatus(id, payStates); + + CardFuelRecord cardFuelRecord = cardFuelRecordService.queryById(id); + receiveParameter.setType("5"); + if (cardFuelRecord.getMtUserId()!=null){ + receiveParameter.setUserId(cardFuelRecord.getMtUserId()); + } + receiveParameter.setContent("囤油卡订单"); } if ("IOS".equals(type)) { - // 存油卡 +// 积分商城 String storeId = ObjectUtil.isEmpty(map1.get("storeId"))?"-1":map1.get("storeId"); integralOrdersService.editPayStatus(orderNo, payStates,Integer.parseInt(storeId)); + + IntegralOrders integralOrders = integralOrdersService.queryIntegralOrdersByOrderNo(orderNo, Integer.parseInt(storeId)); + receiveParameter.setType("4"); + if (integralOrders.getUserId()!=null){ + receiveParameter.setUserId(integralOrders.getUserId()); + } + receiveParameter.setContent("积分订单"); } + this.insertAllOrderInfo(receiveParameter,payStatus); } }catch (Exception e){ log.error(e.getMessage()); @@ -410,6 +471,26 @@ public class FyPayServiceImpl implements FyPayService { @Autowired private AllOrderInfoService allOrderInfoService; + /** + * 添加所有订单信息 + */ + private void insertAllOrderInfo(ReceiveParameter receiveParameter,String payStatus){ + AllOrderInfo allOrderInfo = new AllOrderInfo(); + allOrderInfo.setOrderNo(receiveParameter.getOrderNo()); + allOrderInfo.setType(receiveParameter.getType()); + allOrderInfo.setStoreId(receiveParameter.getStoreId()); + allOrderInfo.setGoodsMoney(receiveParameter.getGoodsMoney()); + allOrderInfo.setPayType(receiveParameter.getPayType()); + allOrderInfo.setUserId(receiveParameter.getUserId()); + allOrderInfo.setPayChannel("cashier"); + allOrderInfo.setStatus(payStatus); + allOrderInfo.setContent(receiveParameter.getContent()); + allOrderInfoService.insertAllOrderInfo(allOrderInfo); + } + + /** + * 添加所有订单信息 + */ private void insertAllOrderInfo(ReceiveParameter receiveParameter){ AllOrderInfo allOrderInfo = new AllOrderInfo(); allOrderInfo.setOrderNo(receiveParameter.getOrderNo()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java index 05d7e4ca5..558ab004f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java @@ -78,9 +78,10 @@ public class MerchantConfigServiceImpl extends ServiceImpl(); queryWrapper.eq("is_use","1"); + queryWrapper.eq("store_id",storeId); List list = baseMapper.selectList(queryWrapper); if (list.size()>0){ for (MerchantConfig merchantConfig : list) { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java index 4ae11bd6c..505fe7d5d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java @@ -54,7 +54,7 @@ public class OilConfigServiceImpl extends ServiceImpl + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java index 0f69b9f9b..96b99a790 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java @@ -91,4 +91,11 @@ public interface IntegralOrdersService { */ Boolean checkTheRedemptionLimit(Integer giftId); + /** + * 根据订单号查询订单信息 + * @param orderNo + * @return + */ + IntegralOrders queryIntegralOrdersByOrderNo(String orderNo,Integer storeId); + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java index 6bdc90708..7b975976f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java @@ -516,4 +516,9 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService { return flag; } + + @Override + public IntegralOrders queryIntegralOrdersByOrderNo(String orderNo,Integer storeId) { + return integralOrdersDao.queryIntegralOrdersByOrderNo(orderNo,storeId); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java index 8100ebcb5..f58f18604 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java @@ -31,7 +31,7 @@ public class AllOrderInfo extends BaseEntity implements Serializable { */ private String orderNo; /** - * 类型：1、油品；2、商品；3、储值卡；4、积分；5、囤油卡；6、油品加商品 + * 类型：1、油品；2、商品；3、储值卡；4、积分；5、囤油卡；6、油品加商品(收银台订单)；7、挂账订单 */ private String type; /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OrderGoodsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OrderGoodsService.java index d73a794a7..f58d67295 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OrderGoodsService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OrderGoodsService.java @@ -24,11 +24,11 @@ public interface OrderGoodsService extends IService { * @param goods * @return */ - public int insertOrderGoods(OrderGoods goods); + public int insertOrderGoods(OrderGoods goods,Integer storeId); /** * 添加库存跟踪信息 * @param goods */ - public void insertStockTrack(OrderGoods goods); + public void insertStockTrack(OrderGoods goods,Integer storeId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index 05df11122..ef27d8ab9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -287,7 +287,7 @@ public class OilOrderServiceImpl extends ServiceImpl i orderGoods.setOrderId(ljOrder2.getId()); orderGoods.setGoodsId(Integer.valueOf(good.get("id").toString())); orderGoods.setNum(Integer.valueOf(good.get("num").toString())); - orderGoodsService.insertOrderGoods(orderGoods); + orderGoodsService.insertOrderGoods(orderGoods,storeId); } } ljOrder1 = orderService.selectGoodsOrder(orderNo); @@ -402,7 +402,7 @@ public class OilOrderServiceImpl extends ServiceImpl i cashierOrder.setGoodsOrderId(goodsOrder1.getId()); } cashierOrderService.insertCashierOrder(cashierOrder); - this.insertAllOrderInfo(orderNo,storeId,oilAmount,payType,userId,"PC"); +// this.insertAllOrderInfo(orderNo,storeId,oilAmount,payType,userId,"PC"); return orders; } @@ -516,7 +516,7 @@ public class OilOrderServiceImpl extends ServiceImpl i cashierOrder.setOilOrderId(oilOrder.getId()); cashierOrderService.insertCashierOrder(cashierOrder); this.updateGrowthValue1(oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId); - this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"applet"); +// this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"applet"); res.put("success","success"); } else { @@ -590,7 +590,7 @@ public class OilOrderServiceImpl extends ServiceImpl i } cashierOrderService.insertCashierOrder(cashierOrder); - this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"applet"); +// this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"applet"); res.put("success","success"); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java index cee278758..1106e7368 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java @@ -35,16 +35,18 @@ public class OrderGoodsServiceImpl extends ServiceImpl