From 1aaab689ba7071efe26b07eafa6621e2de8626e2 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 11 Jan 2023 15:02:29 +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/HighCouponAgentController.java | 6 +- .../bweb/controller/HighGasController.java | 8 +- .../java/com/hai/dao/HighOrderMapperExt.java | 177 ++++-------------- .../order/service/impl/OrderServiceImpl.java | 1 - .../com/hai/service/HighGasOrderService.java | 1 + .../com/hai/service/HighOrderService.java | 7 - .../service/impl/HighOrderServiceImpl.java | 23 +-- 7 files changed, 47 insertions(+), 176 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighCouponAgentController.java b/hai-bweb/src/main/java/com/bweb/controller/HighCouponAgentController.java index be53f3ea..d135f191 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighCouponAgentController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighCouponAgentController.java @@ -492,7 +492,11 @@ public class HighCouponAgentController { Map map = new HashMap<>(); map.put("couponInfo", highCouponService.getCouponById(couponAgentCode.getCouponId())); - map.put("couponCode", highCouponCodeService.getCouponCodeById(couponAgentCode.getCouponCodeId())); + if (couponAgentCode.getCouponCodeId() != null) { + map.put("couponCode", highCouponCodeService.getCouponCodeById(couponAgentCode.getCouponCodeId())); + } else { + map.put("couponCode", null); + } map.put("couponCodeOther", couponCodeOtherService.getDetailByCouponAgentCodeId(couponAgentCode.getId())); map.put("couponAgentCode", couponAgentCode); return ResponseMsgUtil.success(map); diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java index 1596f0ce..9711d8e3 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java @@ -270,7 +270,8 @@ public class HighGasController { } PageHelper.startPage(pageNum, pageSize); - return ResponseMsgUtil.success(new PageInfo<>(highOrderService.getGasOrderList(param))); + // return ResponseMsgUtil.success(new PageInfo<>(highOrderService.getGasOrderList(param))); + return ResponseMsgUtil.success(null); } catch (Exception e) { log.error("HighGasController -> getGasOrderList() error!",e); @@ -545,7 +546,7 @@ public class HighGasController { List> dataList = new ArrayList<>(); List data; - List orderList = highOrderService.getGasOrderList(param); +/* List orderList = highOrderService.getGasOrderList(param); for (GasOrderModel orderModel: orderList) { data = new ArrayList<>(); data.add(orderModel.getOrderNo()); @@ -573,7 +574,8 @@ public class HighGasController { } EasyExcel.write(fileUrl+pathName).head(generationHead(headList)).sheet("加油订单").doWrite(dataList); - return ResponseMsgUtil.success(pathName); + return ResponseMsgUtil.success(pathName);*/ + return ResponseMsgUtil.success(null); } catch (Exception e) { log.error("HighGasController -> getGasOrderList() error!",e); diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java index e8528b5c..a2933725 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java @@ -1,5 +1,4 @@ package com.hai.dao; - import com.hai.entity.HighOrder; import com.hai.model.*; import org.apache.ibatis.annotations.Param; @@ -142,7 +141,6 @@ public interface HighOrderMapperExt { " (select mer.merchant_name from high_merchant mer where EXISTS (select 1 from high_coupon cou where cou.id = a.goods_id and mer.id = cou.merchant_id)) merchantName," + " case a.goods_type when 1 then '卡券' when 2 then '金币充值' when 3 then '加油缴费' end goodsType, " + " a.goods_name goodsName, " + - " b.id orderId, " + " a.goods_type goodsTypeId," + " case a.giveaway_type when 1 then '赠送' when 0 then '购买' end giveawayType," + " b.order_no orderNo," + @@ -176,7 +174,7 @@ public interface HighOrderMapperExt { " and c.company_id = #{map.companyId} " + " and c.coupon_name = #{map.memDiscountName} ", " and c.merchant_id = #{map.merchantId} )" + - " and b.order_no = #{map.orderNo}", + " and b.order_no = #{map.orderNo}", " and b.pay_serial_no = #{map.paySerialNo} ", " and b.pay_model = #{map.payModel} ", " and b.pay_type = #{map.payType} ", @@ -187,62 +185,10 @@ public interface HighOrderMapperExt { " = #{map.payTimeS} ]]> ", " ", " GROUP BY a.id" + - " ORDER BY b.create_time desc" + - ""}) + " ORDER BY b.create_time desc" + + ""}) List selectGoodsOrderList(@Param("map") Map map); - - @Select({""}) - List selectGasOrderList(@Param("map") Map map); - @Select({""}) + ""}) List selectCinemaOrderList(@Param("map") Map map); @Select({""}) + ""}) List getMobileOrderList(@Param("map") Map map); - - + + @Select({""}) List ExportPreOrderList(@Param("map") Map map); @@ -708,7 +654,7 @@ public interface HighOrderMapperExt { " and c.company_id = #{map.companyId} " + " and c.coupon_name = #{map.memDiscountName} ", " and c.merchant_id = #{map.merchantId} )" + - " and b.order_no = #{map.orderNo}", + " and b.order_no = #{map.orderNo}", " and b.pay_serial_no = #{map.paySerialNo} ", " and b.pay_model = #{map.payModel} ", " and b.pay_type = #{map.payType} ", @@ -1010,9 +956,9 @@ public interface HighOrderMapperExt { " and hco.gas_oil_type = #{map.gasOilType} " , " and hco.goods_id = #{map.goodsId} " , " = #{map.createTimeS} ]]> " + - " " + - " AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) " + - " and hco.gas_salesman_id = #{map.gasSalesmanId} " , + " " + + " AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) " + + " and hco.gas_salesman_id = #{map.gasSalesmanId} " , " and hco.gas_org_id = #{map.orgId} " , " and hco.gas_agent_id = #{map.agentId} " , ") as hh; " , @@ -1036,9 +982,9 @@ public interface HighOrderMapperExt { " and hco.gas_oil_type = #{map.gasOilType} " , " and hco.goods_id = #{map.goodsId} " , " = #{map.createTimeS} ]]> " + - " " + - " AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) " + - " and hco.gas_salesman_id = #{map.gasSalesmanId} " , + " " + + " AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) " + + " and hco.gas_salesman_id = #{map.gasSalesmanId} " , " and hco.gas_org_id = #{map.orgId} " , " and hco.gas_agent_id = #{map.agentId} " , ") as hh; " , @@ -1061,7 +1007,7 @@ public interface HighOrderMapperExt { " = #{map.createTimeS} ]]> " , " " , " AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) " + - " and hco.gas_salesman_id = #{map.gasSalesmanId} " , + " and hco.gas_salesman_id = #{map.gasSalesmanId} " , " and hco.gas_org_id = #{map.orgId} " , " and hco.gas_agent_id = #{map.agentId} " , ") as hh; " , @@ -1073,12 +1019,12 @@ public interface HighOrderMapperExt { @Select(value = { "" - }) - List selectGasStoreOrderList(@Param("param") Map param); - @Select({ "" }) List getApiThirdOrderByList(@Param("map") Map map); - } diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java index 947addcf..a2fce6a9 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java @@ -428,7 +428,6 @@ public class OrderServiceImpl implements OrderService { HighOrder orderData = insertOrderData(order); - if (orderData.getOrderStatus().equals(OrderStatus.STATUS1.getNumber())) { // 10分钟内未支付，自动取消订单 Message rocketMsg = MessageBuilder.withPayload(order).build(); diff --git a/hai-service/src/main/java/com/hai/service/HighGasOrderService.java b/hai-service/src/main/java/com/hai/service/HighGasOrderService.java index 5c4a97c4..35f667f9 100644 --- a/hai-service/src/main/java/com/hai/service/HighGasOrderService.java +++ b/hai-service/src/main/java/com/hai/service/HighGasOrderService.java @@ -46,4 +46,5 @@ public interface HighGasOrderService { */ List getGasOrderList(Map param); + } diff --git a/hai-service/src/main/java/com/hai/service/HighOrderService.java b/hai-service/src/main/java/com/hai/service/HighOrderService.java index f22b6fd7..e3c6abea 100644 --- a/hai-service/src/main/java/com/hai/service/HighOrderService.java +++ b/hai-service/src/main/java/com/hai/service/HighOrderService.java @@ -474,13 +474,6 @@ public interface HighOrderService { */ Map getGasStaffHistoryOrderCount(Long gasStaffId, String status); - /** - * 查询加油站订单列表 - * @param param - * @return - */ - List getGasOrderList(Map param) throws Exception; - /** * 统计加油站订单 * @param param 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 a1fcfe2b..f1e403c2 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 @@ -2155,7 +2155,7 @@ public class HighOrderServiceImpl implements HighOrderService { map.put("payTimeE", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeE")), "yyyy-MM-dd HH:mm:ss")); } - return highOrderMapper.selectGasOrderList(map); + return null;//highOrderMapper.selectGasOrderList(map); } @Override @@ -2572,23 +2572,6 @@ public class HighOrderServiceImpl implements HighOrderService { return highOrderMapperExt.selectGasStaffHistoryOrderCount(gasStaffId,status); } - @Override - public List getGasOrderList(Map param) throws Exception { - if (MapUtils.getLong(param, "createTimeS") != null) { - param.put("createTimeS", DateUtil.date2String(new Date(MapUtils.getLong(param, "createTimeS")), "yyyy-MM-dd HH:mm:ss")); - } - if (MapUtils.getLong(param, "createTimeE") != null) { - param.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(param, "createTimeE")), "yyyy-MM-dd HH:mm:ss")); - } - if (MapUtils.getLong(param, "payTimeS") != null) { - param.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(param, "payTimeS")), "yyyy-MM-dd HH:mm:ss")); - } - if (MapUtils.getLong(param, "payTimeE") != null) { - param.put("payTimeE", DateUtil.date2String(new Date(MapUtils.getLong(param, "payTimeE")), "yyyy-MM-dd HH:mm:ss")); - } - return highOrderMapperExt.selectGasStoreOrderList(param); - } - @Override public Map countGasOrder(Map param) throws Exception { if (MapUtils.getLong(param, "createTimeS") != null) { @@ -2610,10 +2593,10 @@ public class HighOrderServiceImpl implements HighOrderService { public GasOrderModel getGasOrderDetail(String orderNo) { Map param = new HashMap<>(); param.put("orderNo", orderNo); - List list = highOrderMapperExt.selectGasStoreOrderList(param); + /*List list = highOrderMapperExt.selectGasOrderList(param); if (list.size() > 0) { return list.get(0); - } + }*/ return null; }