From 40f188eb207541f3ed59c3d6cdeb279a76f6568c Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Wed, 1 Jun 2022 17:15:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutRechargeOrderController.java | 33 +++++++++++++------ .../hai/service/OutRechargeOrderService.java | 2 ++ .../impl/HltUnionCardVipServiceImpl.java | 2 +- .../OutRechargeChildOrderServiceImpl.java | 3 ++ .../impl/OutRechargeOrderServiceImpl.java | 2 +- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java index ba2aa641..5745bb27 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java @@ -19,6 +19,7 @@ import com.hai.common.utils.WxUtils; import com.hai.config.HuiLianTongUnionCardConfig; import com.hai.config.UnionPayConfig; import com.hai.entity.HighRefundAudit; +import com.hai.entity.OutRechargeChildOrder; import com.hai.entity.OutRechargeOrder; import com.hai.entity.OutRechargeOrderRecord; import com.hai.model.*; @@ -58,16 +59,7 @@ public class OutRechargeOrderController { private OutRechargeOrderService outRechargeOrderService; @Resource - private GoodsOrderServiceImpl goodsOrderService; - - @Resource - private HighRefundAuditService highRefundAuditService; - - @Resource - private HighUserService highUserService; - - @Resource - private OutRechargeChildOrderService rechargeOrderRecordService; + private OutRechargeChildOrderService outRechargeChildOrderService; @RequestMapping(value = "/getOrderById", method = RequestMethod.GET) @@ -84,6 +76,27 @@ public class OutRechargeOrderController { } } + @RequestMapping(value = "/getChildOrder", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "根据id查询子订单详情") + public ResponseData getChildOrder(@RequestParam(name = "orderId", required = true) Long orderId) { + try { + + // 查询充值子订单 + Map childOrderMap = new HashMap<>(); + + childOrderMap.put("parent_order_id" , orderId); + + List childOrderList = outRechargeChildOrderService.getListRechargeChildOrder(childOrderMap); + + return ResponseMsgUtil.success(childOrderList); + + } catch (Exception e) { + log.error("HighOrderController --> getOrderById() error!", e); + return ResponseMsgUtil.exception(e); + } + } + // @RequestMapping(value="/importRechargeOrder",method = RequestMethod.POST) // @ResponseBody diff --git a/hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java b/hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java index d9e7577e..8c63c654 100644 --- a/hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java +++ b/hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java @@ -2,6 +2,7 @@ package com.hai.service; import com.alibaba.fastjson.JSONObject; import com.hai.entity.HighUserCard; +import com.hai.entity.OutRechargeChildOrder; import com.hai.entity.OutRechargeOrder; import com.hai.model.OrderCountModel; import com.hai.model.OutOrderModel; @@ -175,4 +176,5 @@ public interface OutRechargeOrderService { */ Integer rechargeOrderNum(Long userId); + } diff --git a/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java index e7f4e724..1570477d 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java @@ -199,7 +199,7 @@ public class HltUnionCardVipServiceImpl implements HltUnionCardVipService { if (equityLevel == 1) { HuiLianTongUnionCardConfig.submitSms(phone , "“E信通会员专属”3张4元话费券、2张99折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。"); } else { - HuiLianTongUnionCardConfig.submitSms(phone , "“工会卡用户专属”2元话费券、2张99折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。"); + HuiLianTongUnionCardConfig.submitSms(phone , "“工会卡用户专属”5张98折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。"); } } diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeChildOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeChildOrderServiceImpl.java index a4845482..a636be22 100644 --- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeChildOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeChildOrderServiceImpl.java @@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -34,6 +35,8 @@ public class OutRechargeChildOrderServiceImpl implements OutRechargeChildOrderSe criteria.andStatusEqualTo(MapUtils.getInteger(map , "status")); } + example.setOrderByClause("create_time desc"); + return rechargeChildOrderMapper.selectByExample(example); } 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 3a201a8d..33edc812 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 @@ -91,7 +91,6 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { private HighUserPayPasswordService highUserPayPasswordService; - @Override public List getListRechargeOrder(Map map) { OutRechargeOrderExample example = new OutRechargeOrderExample(); @@ -836,4 +835,5 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { criteria.andPayStatusEqualTo(101); return outRechargeOrderMapper.selectByExample(example).size(); } + }