From 22d8ff4e846891699389ce5d25fe0939e98fa524 Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Fri, 3 Feb 2023 15:32:38 +0800 Subject: [PATCH] Merge branch 'master' into 2.0-dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * master: 修改配置星巴克 肯德基 会员充值 话费 微信商户号 修改配置星巴克 肯德基 会员充值 话费 微信商户号 # Conflicts: # hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java # hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java --- .../bweb/controller/OutRechargePriceController.java | 12 ------------ .../cweb/controller/HighThirdPartyController.java | 3 +-- .../main/java/com/hai/config/ThirdProductConfig.java | 7 +++---- .../service/impl/OrderCreateHandleServiceImpl.java | 2 +- .../hai/order/service/impl/OrderPayServiceImpl.java | 4 ++++ .../order/service/impl/OrderRefundServiceImpl.java | 2 +- .../com/hai/service/impl/HighOrderServiceImpl.java | 2 +- .../service/impl/OutRechargeOrderServiceImpl.java | 3 ++- 8 files changed, 13 insertions(+), 22 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java b/hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java index ec80876b..99aee160 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java @@ -129,7 +129,6 @@ public class OutRechargePriceController { object.getString("operatorType") == null || object.getJSONArray("rechargePlatform") == null || object.getJSONArray("productPlatform") == null || -// object.getInteger("rechargeType") == null || object.getJSONArray("payType") == null || object.getInteger("rechargeWay") == null ) { @@ -147,17 +146,6 @@ public class OutRechargePriceController { outRechargePriceService.insertRechargePrice(object); - BsOperationLog bsOperationLog = new BsOperationLog(); - - bsOperationLog.setOperationType(1); - bsOperationLog.setBeforeContent(String.valueOf(object)); - bsOperationLog.setAfterContent("新增数据"); - bsOperationLog.setOperatorId(userInfoModel.getSecUser().getId()); - bsOperationLog.setOperatorName(userInfoModel.getSecUser().getUserName()); - bsOperationLog.setEntityName("OutRechargePrice"); - - bsOperationLogService.insertOperationLog(bsOperationLog); - return ResponseMsgUtil.success("新增成功"); } catch (Exception e) { diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java b/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java index 51c53752..3eebe97d 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java @@ -302,11 +302,10 @@ public class HighThirdPartyController { @ApiOperation(value = "查询第三方产品详情") public ResponseData getThirdPartyByDetail(@RequestParam(name = "platformId", required = true) Integer platformId, @RequestParam(name = "productType", required = true) Integer productType, - @RequestParam(name = "productId", required = false) Long productId, @RequestParam(name = "companyId", required = true) Long companyId) { try { - return ResponseMsgUtil.success(thirdProductConfig.getThirdPartyByDetail(platformId , productType , companyId , productId)); + return ResponseMsgUtil.success(thirdProductConfig.getThirdPartyByDetail(platformId , productType , companyId)); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); diff --git a/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java b/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java index 10e8892f..dbfc6271 100644 --- a/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java +++ b/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java @@ -49,12 +49,11 @@ public class ThirdProductConfig { } // 产品折扣比例 - public BsProductConfig getProductConfig(Integer productType , Long companyId , Long productId) { + public BsProductConfig getProductConfig(Integer productType , Long companyId) { Map listMap = new HashMap<>(); listMap.put("productType", productType); listMap.put("companyId", companyId); - listMap.put("productId", productId); List productConfigs = apiProductService.getProductConfig(listMap); @@ -64,8 +63,8 @@ public class ThirdProductConfig { return null; } - public JSONObject getThirdPartyByDetail(Integer platformId , Integer productType , Long companyId , Long productId) { - BsProductConfig productConfig = getProductConfig(productType, companyId , productId); + public JSONObject getThirdPartyByDetail(Integer platformId , Integer productType , Long companyId) { + BsProductConfig productConfig = getProductConfig(productType, companyId); if (productConfig == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂未配置当前内容"); diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java index ee76255c..940d60f0 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java @@ -614,7 +614,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { String orderNo; // 查询详单订单的实际 - JSONObject productDetail = thirdProductConfig.getThirdPartyByDetail(object.getInteger("platformId"), object.getInteger("productType"), object.getLong("companyId") , object.getLong("productId")); + JSONObject productDetail = thirdProductConfig.getThirdPartyByDetail(object.getInteger("platformId"), object.getInteger("productType"), object.getLong("companyId")); // 获取token 千猪请求接口token JSONObject userToken = QianZhuConfig.getTokenV2(user.getId().toString(), user.getName(), user.getPhone()); diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java index bdc998db..8b3055b9 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java @@ -74,6 +74,10 @@ public class OrderPayServiceImpl implements OrderPayService { goodsDesc = "购买优惠券包"; tranDesc = "购买" + order.getHighChildOrderList().get(0).getGoodsName() + "优惠券包"; + } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE9.getNumber())) { + goodsDesc = "购买话费"; + tranDesc = "购买" + order.getHighChildOrderList().get(0).getGoodsName(); + } else { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法支付，请使用其他支付方式"); } diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderRefundServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderRefundServiceImpl.java index eaa3cc07..4527bfa1 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderRefundServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderRefundServiceImpl.java @@ -161,7 +161,7 @@ public class OrderRefundServiceImpl implements OrderRefundService { } else if (orderPayType.getNumber().equals(OrderPayType.PAY_TYPE4.getNumber())) { - JSONObject refund = HuiLianTongUnionCardConfig.refund(refundOrderNo, order.getPaySerialNo()); + JSONObject refund = HuiLianTongUnionCardConfig.refund(refundOrderNo, order.getOrderNo()); if (!refund.getString("respCode").equals("0000")) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR,refund.getString("respMessage")); } 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 b8c1be81..b30bdde1 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 @@ -1426,7 +1426,7 @@ public class HighOrderServiceImpl implements HighOrderService { BigDecimal marketPrice = new BigDecimal(0); // 查询详单订单的实际 - JSONObject productDetail = thirdProductConfig.getThirdPartyByDetail(object.getInteger("platformId"), object.getInteger("productType"), object.getLong("companyId") , object.getLong("productId")); + JSONObject productDetail = thirdProductConfig.getThirdPartyByDetail(object.getInteger("platformId"), object.getInteger("productType"), object.getLong("companyId")); highOrder.setProductType(object.getInteger("productType")); diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java index 95a187cd..ece7a931 100644 --- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java @@ -1007,13 +1007,14 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { // 判断是否充值提交成功 if (childOrder.getStatus() == 102) { outRechargeOrder.setRechargeStatus(201); + outRechargeOrder.setPayStatus(102); } if (childOrder.getStatus() == 103) { outRechargeOrder.setRechargeStatus(205); + outRechargeOrder.setPayStatus(102); } outRechargeOrderService.updateOrder(outRechargeOrder); - System.out.println("话费定时任务 -> 需要重新充值：结束"); } @Override