From 1ade26ce72a0233148c828e7df4ce56a14864320 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Thu, 3 Mar 2022 14:28:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/pay/TuanYouController.java | 12 ++++++ .../service/impl/HighOrderServiceImpl.java | 38 +++++++++++++++++++ .../resources/dev/commonConfig.properties | 10 ++--- 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/TuanYouController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/TuanYouController.java index b6162f47..b672a2c1 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/pay/TuanYouController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/pay/TuanYouController.java @@ -19,6 +19,7 @@ import com.hai.entity.HighOrder; import com.hai.model.OrderRefundModel; import com.hai.model.ResponseData; import com.hai.service.HighOrderService; +import com.hai.service.HighUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -49,6 +50,9 @@ public class TuanYouController { @Resource private HighGasOrderRefundMapper highGasOrderRefundMapper; + @Resource + private HighUserService highUserService; + @RequestMapping(value = "/orderPaymentNotify", method = RequestMethod.POST) @ApiOperation(value = "订单支付回调") @@ -94,6 +98,14 @@ public class TuanYouController { order.setRefundPrice(order.getPayRealPrice()); highOrderService.updateOrderDetail(order); } + } else if (order.getPayType() == 3){ + // 积分退款 + highUserService.goldHandle(order.getMemId(), order.getPayGold(),1, 2, order.getId()); + order.setOrderStatus(4); + order.setRefundTime(new Date()); + order.setRefundPrice(order.getPayRealPrice()); + highOrderService.updateOrderDetail(order); + } else if (order.getPayType() == 4) { String refundOrderNo = String.valueOf(System.currentTimeMillis()); JSONObject refund = HuiLianTongUnionCardConfig.refund(refundOrderNo, order.getPaySerialNo()); diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java index 44379500..310121dc 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java @@ -339,6 +339,44 @@ public class HighOrderServiceImpl implements HighOrderService { } } + if (highChildOrder.getGoodsType() == 3) { + highChildOrder.setChildOrdeStatus(3); + HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(highChildOrder.getGoodsId()); + // 推送团油订单 + Map paramMap = new HashMap<>(); + paramMap.put("gasId", store.getStoreKey()); + paramMap.put("oilNo", highChildOrder.getGasOilNo()); + paramMap.put("gunNo", highChildOrder.getGasGunNo()); + BigDecimal priceGun = highChildOrder.getGasPriceGun(); + BigDecimal priceVip = highChildOrder.getGasPriceVip(); + paramMap.put("priceGun", priceGun); // 枪单价 + paramMap.put("priceVip", priceVip); // 优惠价 + paramMap.put("driverPhone", highOrder.getMemPhone()); + paramMap.put("thirdSerialNo", highOrder.getOrderNo()); + paramMap.put("refuelingAmount", highChildOrder.getTotalPrice()); + + // 油品类型 1:汽油:2:柴油;3:天然气 + if (highChildOrder.getGasOilType() == 1) { + paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouGasolineAccount()); + } else if (highChildOrder.getGasOilType() == 2) { + paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouDieselAccount()); + } + JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(paramMap); + // 推送团油订单记录 + HighGasOrderPush highGasOrderPush = new HighGasOrderPush(); + highGasOrderPush.setType(OrderPushType.type1.getType()); + highGasOrderPush.setOrderNo(highOrder.getOrderNo()); + highGasOrderPush.setCreateTime(new Date()); + highGasOrderPush.setCode(orderPushObject.getString("code")); + highGasOrderPush.setRequestContent(JSONObject.toJSONString(paramMap)); + highGasOrderPush.setReturnContent(orderPushObject.toJSONString()); + highGasOrderPushMapper.insert(highGasOrderPush); + + if (orderPushObject != null && orderPushObject.getString("code").equals("200")) { + highChildOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo")); + } + } + if (highChildOrder.getGoodsType() == 7) { HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderId(highChildOrder.getId()); if (actual != null) { diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties index e19a8812..9d975195 100644 --- a/hai-service/src/main/resources/dev/commonConfig.properties +++ b/hai-service/src/main/resources/dev/commonConfig.properties @@ -1,9 +1,9 @@ # ???? -tuanYouUrl=https://test02-motorcade-hcs.czb365.com -tuanYouAppKey=208241666939552 -tuanYouAppSecret=adecc3cff077834cb8632c8ab3bec0e6 -tuanYouDieselAccount=9b115eao4400 -tuanYouGasolineAccount=9b115e5g4400 +tuanYouUrl=https://test05-motorcade-hcs.czb365.com +tuanYouAppKey=231599775566496 +tuanYouAppSecret=cbfab3c550d6142a779c5196c9416342 +tuanYouDieselAccount=c009bidg4400 +tuanYouGasolineAccount=c009bic04400 # ???? qinzhuUrl=https://live-test.qianzhu8.com