diff --git a/cweb/src/main/java/com/cweb/config/AuthConfig.java b/cweb/src/main/java/com/cweb/config/AuthConfig.java index 876213c..e1a3814 100644 --- a/cweb/src/main/java/com/cweb/config/AuthConfig.java +++ b/cweb/src/main/java/com/cweb/config/AuthConfig.java @@ -103,6 +103,7 @@ public class AuthConfig implements WebMvcConfigurer { .excludePathPatterns("/userMsg/*") .excludePathPatterns("/test/*") .excludePathPatterns("/wexinNotify/*") + .excludePathPatterns("/gasOrder/*") ; } diff --git a/cweb/src/main/java/com/cweb/controller/order/GasOrderController.java b/cweb/src/main/java/com/cweb/controller/order/GasOrderController.java index 4deb288..05df305 100644 --- a/cweb/src/main/java/com/cweb/controller/order/GasOrderController.java +++ b/cweb/src/main/java/com/cweb/controller/order/GasOrderController.java @@ -63,12 +63,37 @@ public class GasOrderController { param.put("payTimeE", payTimeE); PageHelper.startPage(pageNum,pageSize); - PageInfo pageInfo = new PageInfo<>(gasOrderService.getGasOrderList(param)); - List list = pageInfo.getList(); - for (BsGasOrder gasOrder : list) { - gasOrder.setSpread(gasOrderSpreadService.getDetailByOrderNo(gasOrder.getOrderNo())); + return ResponseMsgUtil.success(new PageInfo<>(gasOrderService.getGasOrderList(param))); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/queryOilOrderSpread",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询加油推广订单") + public ResponseData queryOilOrderSpread(@RequestParam(name = "orderNo", required = false) String orderNo, + @RequestParam(name = "orderStatus", required = false) Integer orderStatus, + @RequestParam(name = "payTimeS", required = false) Long payTimeS, + @RequestParam(name = "payTimeE", required = false) Long payTimeE, + @RequestParam(name = "pageNum", required = true) Integer pageNum, + @RequestParam(name = "pageSize", required = true) Integer pageSize) { + try { + UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class); + if (userSession == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); } - return ResponseMsgUtil.success(list); + Map param = new HashMap<>(); + param.put("userId", userSession.getUser().getId()); + param.put("orderNo", orderNo); + param.put("status", orderStatus); + param.put("payTimeS", payTimeS); + param.put("payTimeE", payTimeE); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(gasOrderService.getOilOrderSpread(param))); } catch (Exception e) { log.error("error!",e); diff --git a/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java b/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java index 136b515..587363d 100644 --- a/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java @@ -1,8 +1,13 @@ package com.hfkj.dao; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.type.JdbcType; +import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -54,4 +59,93 @@ public interface BsGasOrderMapperExt { " select count(1) from bs_gas_order where user_phone = #{userPhone} and `status` in (2,5,6) and create_type = 1 and to_days(pay_time) = to_days(NOW())" + "") int countTodayOrder(@Param("userPhone") String userPhone); + @Select("") + @Results({ + @Result(column="id", property="id", jdbcType= JdbcType.BIGINT, id=true), + @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="order_child_no", property="orderChildNo", jdbcType=JdbcType.VARCHAR), + @Result(column="channel_type", property="channelType", jdbcType=JdbcType.INTEGER), + @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT), + @Result(column="agent_name", property="agentName", jdbcType=JdbcType.VARCHAR), + @Result(column="agent_staff_id", property="agentStaffId", jdbcType=JdbcType.BIGINT), + @Result(column="agent_staff_name", property="agentStaffName", jdbcType=JdbcType.VARCHAR), + @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), + @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_chain_brand_id", property="merChainBrandId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_chain_brand_name", property="merChainBrandName", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_address", property="merAddress", jdbcType=JdbcType.VARCHAR), + @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="deduction_coupon_price", property="deductionCouponPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="deduction_oil_price", property="deductionOilPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="pay_integral", property="payIntegral", jdbcType=JdbcType.BIGINT), + @Result(column="payable_price", property="payablePrice", jdbcType=JdbcType.DECIMAL), + @Result(column="actual_pay_price", property="actualPayPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_refuel_price", property="gasRefuelPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_settle_price", property="gasSettlePrice", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_agent_settle_price", property="gasAgentSettlePrice", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_service_fee_rate", property="gasServiceFeeRate", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_service_fee_price", property="gasServiceFeePrice", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_oil_no", property="gasOilNo", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_gun_no", property="gasGunNo", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_oil_type", property="gasOilType", jdbcType=JdbcType.INTEGER), + @Result(column="gas_price_official", property="gasPriceOfficial", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_gun", property="gasPriceGun", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_platform", property="gasPricePlatform", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_cost", property="gasPriceCost", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_oil_liters", property="gasOilLiters", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_discount", property="gasDiscount", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_oil_subsidy", property="gasOilSubsidy", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_liters_preferences", property="gasLitersPreferences", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_preferences", property="gasPricePreferences", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_class_group_id", property="gasClassGroupId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_class_group_name", property="gasClassGroupName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_class_group_task_id", property="gasClassGroupTaskId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_staff_id", property="gasStaffId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_staff_name", property="gasStaffName", jdbcType=JdbcType.VARCHAR), + @Result(column="receipt_status", property="receiptStatus", jdbcType=JdbcType.INTEGER), + @Result(column="receipt_fail_remark", property="receiptFailRemark", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), + @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_channel_order_no", property="payChannelOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_type", property="createType", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="refund_remarks", property="refundRemarks", jdbcType=JdbcType.VARCHAR), + @Result(column="abnormal", property="abnormal", jdbcType=JdbcType.BIT), + @Result(column="abnormal_content", property="abnormalContent", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_4", property="ext4", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_5", property="ext5", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_6", property="ext6", jdbcType=JdbcType.VARCHAR) + }) + List> queryOilOrderSpread(@Param("param") Map param); } diff --git a/service/src/main/java/com/hfkj/service/gas/BsGasOrderService.java b/service/src/main/java/com/hfkj/service/gas/BsGasOrderService.java index fff9cb3..4bffa8e 100644 --- a/service/src/main/java/com/hfkj/service/gas/BsGasOrderService.java +++ b/service/src/main/java/com/hfkj/service/gas/BsGasOrderService.java @@ -2,6 +2,7 @@ package com.hfkj.service.gas; import com.hfkj.entity.BsGasOrder; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -73,6 +74,13 @@ public interface BsGasOrderService { */ List getGasOrderList(Map param); + /** + * 查询加油推广订单 + * @param param + * @return + */ + List> getOilOrderSpread(Map param); + /** * 统计今日订单数量 * @param userPhone diff --git a/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java index f7507d2..8aff2a2 100644 --- a/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java @@ -16,10 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -277,6 +274,21 @@ public class BsGasOrderServiceImpl implements BsGasOrderService { return gasOrderMapper.selectByExample(example); } + @Override + public List> getOilOrderSpread(Map param) { + if (StringUtils.isBlank(MapUtils.getString(param, "status"))) { + // 设置查询默认状态数据 + param.put("status", "2,4"); + } + if (MapUtils.getLong(param, "payTimeS") != null) { + param.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(param, "payTimeS")),DateUtil.Y_M_D_HMS)); + } + if (MapUtils.getLong(param, "payTimeE") != null) { + param.put("payTimeE", DateUtil.date2String(new Date(MapUtils.getLong(param, "payTimeE")),DateUtil.Y_M_D_HMS)); + } + return gasOrderMapper.queryOilOrderSpread(param); + } + @Override public int countTodayOrder(String userPhone) { return gasOrderMapper.countTodayOrder(userPhone);