From 76c598d18e72bfdcef15d6e3b9da06bb209b7c46 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Sat, 2 Apr 2022 09:20:55 +0800 Subject: [PATCH 1/2] =?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/HighTyAgentController.java | 1 + .../HighTyAgentOilStationController.java | 53 +++ .../HighTyAgentPriceController.java | 87 +++-- .../cweb/controller/HighGasController.java | 42 ++- .../cweb/controller/HighOrderController.java | 23 +- .../com/hai/dao/HighChildOrderMapper.java | 34 +- .../hai/dao/HighChildOrderSqlProvider.java | 70 ++++ .../dao/HighTyAgentOilStationMapperExt.java | 50 +++ .../java/com/hai/entity/HighChildOrder.java | 80 +++++ .../com/hai/entity/HighChildOrderExample.java | 330 ++++++++++++++++++ .../main/java/com/hai/entity/HighOrder.java | 10 + .../main/java/com/hai/model/TyOrderModel.java | 144 ++++++++ .../service/HighTyAgentOilStationService.java | 8 + .../HighTyAgentOilStationServiceImpl.java | 6 + 14 files changed, 893 insertions(+), 45 deletions(-) create mode 100644 hai-service/src/main/java/com/hai/model/TyOrderModel.java diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentController.java b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentController.java index 90feb4c0..772895fd 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentController.java @@ -198,4 +198,5 @@ public class HighTyAgentController { + } diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java index 37fa4e54..a9db6fe7 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java @@ -8,11 +8,13 @@ import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.security.UserCenter; import com.hai.common.utils.ResponseMsgUtil; +import com.hai.entity.HighTySalesman; import com.hai.enum_type.UserObjectTypeEnum; import com.hai.model.ResponseData; import com.hai.model.UserInfoModel; import com.hai.service.BsOrganizationService; import com.hai.service.HighTyAgentOilStationService; +import com.hai.service.HighTySalesmanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -39,6 +41,9 @@ public class HighTyAgentOilStationController { @Resource private BsOrganizationService organizationService; + @Resource + private HighTySalesmanService tySalesmanService; + @Resource private UserCenter userCenter; @@ -315,4 +320,52 @@ public class HighTyAgentOilStationController { return ResponseMsgUtil.exception(e); } } + + + @RequestMapping(value = "/getOrderList", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询订单列表") + public ResponseData getOrderList(@RequestParam(name = "orderNo", required = false) String orderNo, + @RequestParam(name = "goodsName", required = false) String goodsName, + @RequestParam(name = "salesmanName", required = false) String salesmanName, + @RequestParam(name = "agentName", required = false) String agentName, + @RequestParam(name = "orgName", required = false) String orgName, + @RequestParam(name = "pageNum", required = true) Integer pageNum, + @RequestParam(name = "pageSize", required = true) Integer pageSize) { + try { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); + } + Map param = new HashMap<>(); + param.put("orderNo", orderNo); + param.put("goodsName", goodsName); + + if (userModel.getBsCompany() != null && userModel.getSecUser().getAdminFlag().equals(1)) { + param.put("companyId", userModel.getBsCompany().getId()); + param.put("orgName", orgName); + param.put("agentName", agentName); + param.put("salesmanName", salesmanName); + + } else if (userModel.getBsCompany() != null && userModel.getSecUser().getAdminFlag().equals(0)) { + param.put("orgId", userModel.getBsOrganization().getId()); + param.put("agentName", agentName); + param.put("salesmanName", salesmanName); + + } else if (userModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type6.getType())) { + param.put("agentId", userModel.getHighTyAgent().getId()); + param.put("salesmanName", salesmanName); + + } else if (userModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type7.getType())) { + param.put("salesmanId", userModel.getHighTySalesman().getId()); + } + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(highTyAgentOilStationService.getOrderList(param))); + + } catch (Exception e) { + log.error("HighTyAgentController --> getAgentList() error!", e); + return ResponseMsgUtil.exception(e); + } + } } diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentPriceController.java b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentPriceController.java index c2a3dc5b..8ddcc751 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentPriceController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentPriceController.java @@ -1,18 +1,16 @@ package com.bweb.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.security.UserCenter; import com.hai.common.utils.ResponseMsgUtil; -import com.hai.entity.HighGasOilPrice; -import com.hai.entity.HighMerchantStore; -import com.hai.entity.HighTyAgentPrice; +import com.hai.entity.*; import com.hai.model.ResponseData; -import com.hai.service.HighGasOilPriceService; -import com.hai.service.HighMerchantStoreService; -import com.hai.service.HighTyAgentPriceService; +import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -37,41 +35,57 @@ public class HighTyAgentPriceController { @Resource private HighTyAgentPriceService tyAgentPriceService; + @Resource + private HighTyAgentOilStationService tyAgentOilStationService; + @Resource private HighMerchantStoreService merchantStoreService; @Resource private HighGasOilPriceService gasOilPriceService; + @Resource + private HighGasDiscountOilPriceService gasDiscountOilPriceService; + + @Resource + private CommonService commonService; + @Resource private UserCenter userCenter; @RequestMapping(value = "/editPrice", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "编辑价格") - public ResponseData editPrice(@RequestBody JSONObject body) { + public ResponseData editPrice(@RequestBody JSONArray bodyArray) { try { - if (body.getLong("tyAgentOilStationId") == null - || StringUtils.isBlank(body.getString("oilNoName")) - || StringUtils.isBlank(body.getString("oilNo")) - || body.getBigDecimal("priceRate") == null) { + if (bodyArray == null || bodyArray.size() == 0) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); } - // 查询油站 - HighTyAgentPrice agentOilStation = tyAgentPriceService.getDetail(body.getLong("tyAgentOilStationId"), body.getString("oilNo")); - if (agentOilStation == null) { - agentOilStation = new HighTyAgentPrice(); - agentOilStation.setTyAgentOilStationId(body.getLong("tyAgentOilStationId")); - agentOilStation.setOilNoName(body.getString("oilNoName")); - agentOilStation.setOilNo(body.getString("oilNo")); - agentOilStation.setPriceRate(body.getBigDecimal("priceRate")); - } else { - agentOilStation.setPriceRate(body.getBigDecimal("priceRate")); + for (Object obj : bodyArray) { + JSONObject body = (JSONObject)JSONObject.toJSON(obj); + if (body.getLong("tyAgentOilStationId") == null + || StringUtils.isBlank(body.getString("oilNoName")) + || StringUtils.isBlank(body.getString("oilNo")) + || body.getBigDecimal("priceRate") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + + // 查询油站 + HighTyAgentPrice agentOilStation = tyAgentPriceService.getDetail(body.getLong("tyAgentOilStationId"), body.getString("oilNo")); + if (agentOilStation == null) { + agentOilStation = new HighTyAgentPrice(); + agentOilStation.setTyAgentOilStationId(body.getLong("tyAgentOilStationId")); + agentOilStation.setOilNoName(body.getString("oilNoName")); + agentOilStation.setOilNo(body.getString("oilNo")); + agentOilStation.setPriceRate(body.getBigDecimal("priceRate")); + } else { + agentOilStation.setPriceRate(body.getBigDecimal("priceRate")); + } + tyAgentPriceService.editTyAgentPrice(agentOilStation); } - tyAgentPriceService.editTyAgentPrice(agentOilStation); return ResponseMsgUtil.success("操作成功"); @@ -87,22 +101,41 @@ public class HighTyAgentPriceController { public ResponseData getOilStationPrice(@RequestParam(name = "oilStationId", required = true) Long oilStationId) { try { - List oilPriceList = gasOilPriceService.getGasOilPriceByStore(oilStationId); + HighTyAgentOilStation station = tyAgentOilStationService.getDetailByOilStationId(oilStationId); + if (station == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "加油站未分配，无法查看"); + } + List oilPriceList = gasOilPriceService.getGasOilPriceByStore(oilStationId); + if (oilPriceList == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "此加油站，暂无法配置"); + } List> oilPriceMapList = new ArrayList<>(); Map oilPriceMap; for (HighGasOilPrice price : oilPriceList) { oilPriceMap = new HashMap<>(); - oilPriceMap.put("oilStationId", oilStationId); + oilPriceMap.put("tyAgentOilStationId", station.getId()); oilPriceMap.put("oilNo", price.getOilNo()); oilPriceMap.put("oilNoName", price.getOilNoName()); - + oilPriceMap.put("lowPrice", commonService.getDictionaryCodeName("TY_AGENT_OIL_STATION_LOW_PRICE", price.getOilNo().toString())); + + // 价格 + HighTyAgentPrice priceRate = tyAgentPriceService.getDetail(station.getId(), price.getOilNo().toString()); + if (priceRate == null) { + HighGasDiscountOilPrice oilNo = gasDiscountOilPriceService.getDetailByOilNo(price.getOilNo().toString()); + if (oilNo == null) { + oilPriceMap.put("priceRate", 0); + } else { + oilPriceMap.put("priceRate", oilNo.getPriceRate()); + } + } else { + oilPriceMap.put("priceRate", priceRate.getPriceRate()); + } oilPriceMapList.add(oilPriceMap); - HighTyAgentPrice tyAgentPrice = tyAgentPriceService.getDetail(oilStationId, price.getOilNo().toString()); } - return ResponseMsgUtil.success(oilPriceList); + return ResponseMsgUtil.success(oilPriceMapList); } catch (Exception e) { log.error("HighTyAgentPriceController --> getOilStationPrice() error!", e); diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java b/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java index fff24cb9..da9a16be 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java @@ -13,16 +13,11 @@ import com.hai.common.utils.ResponseMsgUtil; import com.hai.config.CommonSysConst; import com.hai.config.TuanYouConfig; import com.hai.dao.HighGasOrderPushMapper; -import com.hai.entity.HighGasDiscountOilPrice; -import com.hai.entity.HighGasOrderPush; -import com.hai.entity.HighOrder; -import com.hai.entity.SecRegion; +import com.hai.entity.*; import com.hai.enum_type.OrderPushType; +import com.hai.model.HighMerchantStoreModel; import com.hai.model.ResponseData; -import com.hai.service.CommonService; -import com.hai.service.HighGasDiscountOilPriceService; -import com.hai.service.HighGasOilPriceService; -import com.hai.service.HighOrderService; +import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.MapUtils; @@ -56,9 +51,18 @@ public class HighGasController { @Resource private HighGasDiscountOilPriceService highGasDiscountOilPriceService; + @Resource + private HighTyAgentOilStationService tyAgentOilStationService; + + @Resource + private HighTyAgentPriceService tyAgentPriceService; + @Resource private HighGasOrderPushMapper highGasOrderPushMapper; + @Resource + private HighMerchantStoreService merchantStoreService; + @RequestMapping(value="/getGasStoreList",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询加油站列表") @@ -116,9 +120,16 @@ public class HighGasController { @ApiOperation(value = "根据门店key 查询") public ResponseData getGasDetailByStoreKey(@RequestParam(name = "storeKey", required = true) String storeKey, @RequestParam(name = "longitude", required = true) String longitude, - @RequestParam(name = "latitude", required = true) String latitude) { + @RequestParam(name = "latitude", required = true) String latitude, + @RequestParam(name = "isTyAgent", required = false) Boolean isTyAgent) { try { + // 商户门店 + HighMerchantStoreModel store = merchantStoreService.getMerchantStoreByKey(storeKey); + if (store == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到加油站"); + } + JSONObject jsonObject = TuanYouConfig.queryGasInfoByGasId(storeKey); if (jsonObject != null && jsonObject.getString("code").equals("200")) { JSONObject result = jsonObject.getJSONObject("result"); @@ -141,6 +152,19 @@ public class HighGasController { price.put("priceVip", price.getBigDecimal("priceOfficial").multiply(priceRate).setScale(2, BigDecimal.ROUND_DOWN)); } + if (isTyAgent != null && isTyAgent == true) { + // 查询是否配置了优惠比例 + HighTyAgentOilStation tyAgentOilStation = tyAgentOilStationService.getDetailByOilStationId(store.getId()); + if (tyAgentOilStation != null) { + HighTyAgentPrice tyAgentPrice = tyAgentPriceService.getDetail(tyAgentOilStation.getId(), price.getString("oilNo")); + if (tyAgentPrice != null) { + // 优惠比例 / 100 = 最终优惠比例 + BigDecimal priceRate = tyAgentPrice.getPriceRate().divide(new BigDecimal("100").setScale(2, BigDecimal.ROUND_DOWN)); + // 油品国标价 * 最终优惠比例 + price.put("priceVip", price.getBigDecimal("priceOfficial").multiply(priceRate).setScale(2, BigDecimal.ROUND_DOWN)); + } + } + } // 过滤油品,只保留汽油 if (price.getInteger("oilType") == 1) { newOilPriceList.add(price); diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java index a3026978..544732bf 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java @@ -77,6 +77,12 @@ public class HighOrderController { @Resource private HighUserService highUserService; + @Resource + private HighTyAgentOilStationService tyAgentOilStationService; + + @Resource + private HighTyAgentPriceService tyAgentPriceService; + @RequestMapping(value="/addOrder",method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "增加订单") @@ -222,6 +228,19 @@ public class HighOrderController { } highOrder.setPayType(2); // 第三方平台 + if (highOrder.getIsTyAgent() != null && highOrder.getIsTyAgent() == true) { + // 查询加油站 + HighTyAgentOilStation oilStation = tyAgentOilStationService.getDetailByOilStationId(childOrder.getGoodsId()); + if (oilStation != null) { + childOrder.setGasSalesmanId(oilStation.getTySalesmanId()); + childOrder.setGasSalesmanName(oilStation.getTySalesmanName()); + childOrder.setGasAgentId(oilStation.getTyAgentId()); + childOrder.setGasAgentName(oilStation.getTyAgentName()); + childOrder.setGasOrgId(oilStation.getOrganizationId()); + childOrder.setGasOrgName(oilStation.getOrganizationName()); + } + } + // 获取当前加油价格 JSONObject jsonObject = TuanYouConfig.queryCompanyPriceDetail(store.getStoreKey(), childOrder.getGasOilNo()); if (jsonObject == null || !jsonObject.getString("code").equals("200")) { @@ -405,8 +424,8 @@ public class HighOrderController { } public static void main(String[] args) { - System.out.println(new BigDecimal("100").divide(new BigDecimal("8.10"),10,BigDecimal.ROUND_DOWN) - .multiply(new BigDecimal("7.69")).setScale(2,BigDecimal.ROUND_HALF_UP)); + System.out.println(new BigDecimal("100").divide(new BigDecimal("7.00"),10,BigDecimal.ROUND_DOWN) + .multiply(new BigDecimal("4.2")).setScale(2,BigDecimal.ROUND_HALF_UP)); } @RequestMapping(value = "/getOrderById", method = RequestMethod.GET) diff --git a/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java b/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java index 64d7d91c..17a2db28 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java @@ -51,9 +51,11 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "gas_oil_no, gas_gun_no, ", "gas_oil_type, gas_order_no, ", "gas_price_gun, gas_price_vip, ", - "gas_salesman_id, ext_1, ", - "ext_2, ext_3, ext_4, ", - "ext_5, ext_6)", + "gas_salesman_id, gas_salesman_name, ", + "gas_agent_id, gas_agent_name, ", + "gas_org_id, gas_org_name, ", + "ext_1, ext_2, ext_3, ", + "ext_4, ext_5, ext_6)", "values (#{orderId,jdbcType=BIGINT}, #{memId,jdbcType=BIGINT}, ", "#{storeId,jdbcType=BIGINT}, #{storeName,jdbcType=VARCHAR}, ", "#{storeAddress,jdbcType=VARCHAR}, #{goodsType,jdbcType=INTEGER}, ", @@ -66,9 +68,11 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "#{gasOilNo,jdbcType=VARCHAR}, #{gasGunNo,jdbcType=VARCHAR}, ", "#{gasOilType,jdbcType=INTEGER}, #{gasOrderNo,jdbcType=VARCHAR}, ", "#{gasPriceGun,jdbcType=DECIMAL}, #{gasPriceVip,jdbcType=DECIMAL}, ", - "#{gasSalesmanId,jdbcType=BIGINT}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{ext4,jdbcType=VARCHAR}, ", - "#{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})" + "#{gasSalesmanId,jdbcType=BIGINT}, #{gasSalesmanName,jdbcType=VARCHAR}, ", + "#{gasAgentId,jdbcType=BIGINT}, #{gasAgentName,jdbcType=VARCHAR}, ", + "#{gasOrgId,jdbcType=BIGINT}, #{gasOrgName,jdbcType=VARCHAR}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, ", + "#{ext4,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighChildOrder record); @@ -105,6 +109,11 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="gas_price_gun", property="gasPriceGun", jdbcType=JdbcType.DECIMAL), @Result(column="gas_price_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL), @Result(column="gas_salesman_id", property="gasSalesmanId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_salesman_name", property="gasSalesmanName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_agent_id", property="gasAgentId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_agent_name", property="gasAgentName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_org_id", property="gasOrgId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_org_name", property="gasOrgName", 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), @@ -120,7 +129,8 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "goods_name, goods_desc, goods_img, goods_spec_name, goods_price, goods_actual_price, ", "sale_count, total_price, giveaway_type, child_orde_status, praise_status, gas_oil_no, ", "gas_gun_no, gas_oil_type, gas_order_no, gas_price_gun, gas_price_vip, gas_salesman_id, ", - "ext_1, ext_2, ext_3, ext_4, ext_5, ext_6", + "gas_salesman_name, gas_agent_id, gas_agent_name, gas_org_id, gas_org_name, ext_1, ", + "ext_2, ext_3, ext_4, ext_5, ext_6", "from high_child_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -151,6 +161,11 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="gas_price_gun", property="gasPriceGun", jdbcType=JdbcType.DECIMAL), @Result(column="gas_price_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL), @Result(column="gas_salesman_id", property="gasSalesmanId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_salesman_name", property="gasSalesmanName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_agent_id", property="gasAgentId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_agent_name", property="gasAgentName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_org_id", property="gasOrgId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_org_name", property="gasOrgName", 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), @@ -196,6 +211,11 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "gas_price_gun = #{gasPriceGun,jdbcType=DECIMAL},", "gas_price_vip = #{gasPriceVip,jdbcType=DECIMAL},", "gas_salesman_id = #{gasSalesmanId,jdbcType=BIGINT},", + "gas_salesman_name = #{gasSalesmanName,jdbcType=VARCHAR},", + "gas_agent_id = #{gasAgentId,jdbcType=BIGINT},", + "gas_agent_name = #{gasAgentName,jdbcType=VARCHAR},", + "gas_org_id = #{gasOrgId,jdbcType=BIGINT},", + "gas_org_name = #{gasOrgName,jdbcType=VARCHAR},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", "ext_3 = #{ext3,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java index ac75b8ca..b488da98 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java @@ -128,6 +128,26 @@ public class HighChildOrderSqlProvider { sql.VALUES("gas_salesman_id", "#{gasSalesmanId,jdbcType=BIGINT}"); } + if (record.getGasSalesmanName() != null) { + sql.VALUES("gas_salesman_name", "#{gasSalesmanName,jdbcType=VARCHAR}"); + } + + if (record.getGasAgentId() != null) { + sql.VALUES("gas_agent_id", "#{gasAgentId,jdbcType=BIGINT}"); + } + + if (record.getGasAgentName() != null) { + sql.VALUES("gas_agent_name", "#{gasAgentName,jdbcType=VARCHAR}"); + } + + if (record.getGasOrgId() != null) { + sql.VALUES("gas_org_id", "#{gasOrgId,jdbcType=BIGINT}"); + } + + if (record.getGasOrgName() != null) { + sql.VALUES("gas_org_name", "#{gasOrgName,jdbcType=VARCHAR}"); + } + if (record.getExt1() != null) { sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); } @@ -187,6 +207,11 @@ public class HighChildOrderSqlProvider { sql.SELECT("gas_price_gun"); sql.SELECT("gas_price_vip"); sql.SELECT("gas_salesman_id"); + sql.SELECT("gas_salesman_name"); + sql.SELECT("gas_agent_id"); + sql.SELECT("gas_agent_name"); + sql.SELECT("gas_org_id"); + sql.SELECT("gas_org_name"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); sql.SELECT("ext_3"); @@ -314,6 +339,26 @@ public class HighChildOrderSqlProvider { sql.SET("gas_salesman_id = #{record.gasSalesmanId,jdbcType=BIGINT}"); } + if (record.getGasSalesmanName() != null) { + sql.SET("gas_salesman_name = #{record.gasSalesmanName,jdbcType=VARCHAR}"); + } + + if (record.getGasAgentId() != null) { + sql.SET("gas_agent_id = #{record.gasAgentId,jdbcType=BIGINT}"); + } + + if (record.getGasAgentName() != null) { + sql.SET("gas_agent_name = #{record.gasAgentName,jdbcType=VARCHAR}"); + } + + if (record.getGasOrgId() != null) { + sql.SET("gas_org_id = #{record.gasOrgId,jdbcType=BIGINT}"); + } + + if (record.getGasOrgName() != null) { + sql.SET("gas_org_name = #{record.gasOrgName,jdbcType=VARCHAR}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); } @@ -372,6 +417,11 @@ public class HighChildOrderSqlProvider { sql.SET("gas_price_gun = #{record.gasPriceGun,jdbcType=DECIMAL}"); sql.SET("gas_price_vip = #{record.gasPriceVip,jdbcType=DECIMAL}"); sql.SET("gas_salesman_id = #{record.gasSalesmanId,jdbcType=BIGINT}"); + sql.SET("gas_salesman_name = #{record.gasSalesmanName,jdbcType=VARCHAR}"); + sql.SET("gas_agent_id = #{record.gasAgentId,jdbcType=BIGINT}"); + sql.SET("gas_agent_name = #{record.gasAgentName,jdbcType=VARCHAR}"); + sql.SET("gas_org_id = #{record.gasOrgId,jdbcType=BIGINT}"); + sql.SET("gas_org_name = #{record.gasOrgName,jdbcType=VARCHAR}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); @@ -488,6 +538,26 @@ public class HighChildOrderSqlProvider { sql.SET("gas_salesman_id = #{gasSalesmanId,jdbcType=BIGINT}"); } + if (record.getGasSalesmanName() != null) { + sql.SET("gas_salesman_name = #{gasSalesmanName,jdbcType=VARCHAR}"); + } + + if (record.getGasAgentId() != null) { + sql.SET("gas_agent_id = #{gasAgentId,jdbcType=BIGINT}"); + } + + if (record.getGasAgentName() != null) { + sql.SET("gas_agent_name = #{gasAgentName,jdbcType=VARCHAR}"); + } + + if (record.getGasOrgId() != null) { + sql.SET("gas_org_id = #{gasOrgId,jdbcType=BIGINT}"); + } + + if (record.getGasOrgName() != null) { + sql.SET("gas_org_name = #{gasOrgName,jdbcType=VARCHAR}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java index 02750d6d..8092689f 100644 --- a/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java @@ -1,6 +1,7 @@ package com.hai.dao; import com.hai.model.TyAgentOilStationModel; +import com.hai.model.TyOrderModel; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -51,4 +52,53 @@ public interface HighTyAgentOilStationMapperExt { "") List queryOilStationList(@Param("param") Map param); + @Select("") + List getOrderList(@Param("param") Map param); } diff --git a/hai-service/src/main/java/com/hai/entity/HighChildOrder.java b/hai-service/src/main/java/com/hai/entity/HighChildOrder.java index 4e41d75f..3bbddb83 100644 --- a/hai-service/src/main/java/com/hai/entity/HighChildOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighChildOrder.java @@ -143,6 +143,31 @@ public class HighChildOrder implements Serializable { */ private Long gasSalesmanId; + /** + * 【加油站】业务员名称 + */ + private String gasSalesmanName; + + /** + * 【加油站】代理商id + */ + private Long gasAgentId; + + /** + * 【加油站】代理商名称 + */ + private String gasAgentName; + + /** + * 【加油站】代理公司id + */ + private Long gasOrgId; + + /** + * 【加油站】代理公司名称 + */ + private String gasOrgName; + private String ext1; private String ext2; @@ -365,6 +390,46 @@ public class HighChildOrder implements Serializable { this.gasSalesmanId = gasSalesmanId; } + public String getGasSalesmanName() { + return gasSalesmanName; + } + + public void setGasSalesmanName(String gasSalesmanName) { + this.gasSalesmanName = gasSalesmanName; + } + + public Long getGasAgentId() { + return gasAgentId; + } + + public void setGasAgentId(Long gasAgentId) { + this.gasAgentId = gasAgentId; + } + + public String getGasAgentName() { + return gasAgentName; + } + + public void setGasAgentName(String gasAgentName) { + this.gasAgentName = gasAgentName; + } + + public Long getGasOrgId() { + return gasOrgId; + } + + public void setGasOrgId(Long gasOrgId) { + this.gasOrgId = gasOrgId; + } + + public String getGasOrgName() { + return gasOrgName; + } + + public void setGasOrgName(String gasOrgName) { + this.gasOrgName = gasOrgName; + } + public String getExt1() { return ext1; } @@ -451,6 +516,11 @@ public class HighChildOrder implements Serializable { && (this.getGasPriceGun() == null ? other.getGasPriceGun() == null : this.getGasPriceGun().equals(other.getGasPriceGun())) && (this.getGasPriceVip() == null ? other.getGasPriceVip() == null : this.getGasPriceVip().equals(other.getGasPriceVip())) && (this.getGasSalesmanId() == null ? other.getGasSalesmanId() == null : this.getGasSalesmanId().equals(other.getGasSalesmanId())) + && (this.getGasSalesmanName() == null ? other.getGasSalesmanName() == null : this.getGasSalesmanName().equals(other.getGasSalesmanName())) + && (this.getGasAgentId() == null ? other.getGasAgentId() == null : this.getGasAgentId().equals(other.getGasAgentId())) + && (this.getGasAgentName() == null ? other.getGasAgentName() == null : this.getGasAgentName().equals(other.getGasAgentName())) + && (this.getGasOrgId() == null ? other.getGasOrgId() == null : this.getGasOrgId().equals(other.getGasOrgId())) + && (this.getGasOrgName() == null ? other.getGasOrgName() == null : this.getGasOrgName().equals(other.getGasOrgName())) && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())) @@ -489,6 +559,11 @@ public class HighChildOrder implements Serializable { result = prime * result + ((getGasPriceGun() == null) ? 0 : getGasPriceGun().hashCode()); result = prime * result + ((getGasPriceVip() == null) ? 0 : getGasPriceVip().hashCode()); result = prime * result + ((getGasSalesmanId() == null) ? 0 : getGasSalesmanId().hashCode()); + result = prime * result + ((getGasSalesmanName() == null) ? 0 : getGasSalesmanName().hashCode()); + result = prime * result + ((getGasAgentId() == null) ? 0 : getGasAgentId().hashCode()); + result = prime * result + ((getGasAgentName() == null) ? 0 : getGasAgentName().hashCode()); + result = prime * result + ((getGasOrgId() == null) ? 0 : getGasOrgId().hashCode()); + result = prime * result + ((getGasOrgName() == null) ? 0 : getGasOrgName().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); @@ -530,6 +605,11 @@ public class HighChildOrder implements Serializable { sb.append(", gasPriceGun=").append(gasPriceGun); sb.append(", gasPriceVip=").append(gasPriceVip); sb.append(", gasSalesmanId=").append(gasSalesmanId); + sb.append(", gasSalesmanName=").append(gasSalesmanName); + sb.append(", gasAgentId=").append(gasAgentId); + sb.append(", gasAgentName=").append(gasAgentName); + sb.append(", gasOrgId=").append(gasOrgId); + sb.append(", gasOrgName=").append(gasOrgName); sb.append(", ext1=").append(ext1); sb.append(", ext2=").append(ext2); sb.append(", ext3=").append(ext3); diff --git a/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java b/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java index 72b0edf3..2c04d290 100644 --- a/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java @@ -1775,6 +1775,336 @@ public class HighChildOrderExample { return (Criteria) this; } + public Criteria andGasSalesmanNameIsNull() { + addCriterion("gas_salesman_name is null"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameIsNotNull() { + addCriterion("gas_salesman_name is not null"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameEqualTo(String value) { + addCriterion("gas_salesman_name =", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameNotEqualTo(String value) { + addCriterion("gas_salesman_name <>", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameGreaterThan(String value) { + addCriterion("gas_salesman_name >", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameGreaterThanOrEqualTo(String value) { + addCriterion("gas_salesman_name >=", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameLessThan(String value) { + addCriterion("gas_salesman_name <", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameLessThanOrEqualTo(String value) { + addCriterion("gas_salesman_name <=", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameLike(String value) { + addCriterion("gas_salesman_name like", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameNotLike(String value) { + addCriterion("gas_salesman_name not like", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameIn(List values) { + addCriterion("gas_salesman_name in", values, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameNotIn(List values) { + addCriterion("gas_salesman_name not in", values, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameBetween(String value1, String value2) { + addCriterion("gas_salesman_name between", value1, value2, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameNotBetween(String value1, String value2) { + addCriterion("gas_salesman_name not between", value1, value2, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasAgentIdIsNull() { + addCriterion("gas_agent_id is null"); + return (Criteria) this; + } + + public Criteria andGasAgentIdIsNotNull() { + addCriterion("gas_agent_id is not null"); + return (Criteria) this; + } + + public Criteria andGasAgentIdEqualTo(Long value) { + addCriterion("gas_agent_id =", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdNotEqualTo(Long value) { + addCriterion("gas_agent_id <>", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdGreaterThan(Long value) { + addCriterion("gas_agent_id >", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdGreaterThanOrEqualTo(Long value) { + addCriterion("gas_agent_id >=", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdLessThan(Long value) { + addCriterion("gas_agent_id <", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdLessThanOrEqualTo(Long value) { + addCriterion("gas_agent_id <=", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdIn(List values) { + addCriterion("gas_agent_id in", values, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdNotIn(List values) { + addCriterion("gas_agent_id not in", values, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdBetween(Long value1, Long value2) { + addCriterion("gas_agent_id between", value1, value2, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdNotBetween(Long value1, Long value2) { + addCriterion("gas_agent_id not between", value1, value2, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentNameIsNull() { + addCriterion("gas_agent_name is null"); + return (Criteria) this; + } + + public Criteria andGasAgentNameIsNotNull() { + addCriterion("gas_agent_name is not null"); + return (Criteria) this; + } + + public Criteria andGasAgentNameEqualTo(String value) { + addCriterion("gas_agent_name =", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameNotEqualTo(String value) { + addCriterion("gas_agent_name <>", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameGreaterThan(String value) { + addCriterion("gas_agent_name >", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameGreaterThanOrEqualTo(String value) { + addCriterion("gas_agent_name >=", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameLessThan(String value) { + addCriterion("gas_agent_name <", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameLessThanOrEqualTo(String value) { + addCriterion("gas_agent_name <=", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameLike(String value) { + addCriterion("gas_agent_name like", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameNotLike(String value) { + addCriterion("gas_agent_name not like", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameIn(List values) { + addCriterion("gas_agent_name in", values, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameNotIn(List values) { + addCriterion("gas_agent_name not in", values, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameBetween(String value1, String value2) { + addCriterion("gas_agent_name between", value1, value2, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameNotBetween(String value1, String value2) { + addCriterion("gas_agent_name not between", value1, value2, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasOrgIdIsNull() { + addCriterion("gas_org_id is null"); + return (Criteria) this; + } + + public Criteria andGasOrgIdIsNotNull() { + addCriterion("gas_org_id is not null"); + return (Criteria) this; + } + + public Criteria andGasOrgIdEqualTo(Long value) { + addCriterion("gas_org_id =", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdNotEqualTo(Long value) { + addCriterion("gas_org_id <>", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdGreaterThan(Long value) { + addCriterion("gas_org_id >", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdGreaterThanOrEqualTo(Long value) { + addCriterion("gas_org_id >=", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdLessThan(Long value) { + addCriterion("gas_org_id <", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdLessThanOrEqualTo(Long value) { + addCriterion("gas_org_id <=", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdIn(List values) { + addCriterion("gas_org_id in", values, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdNotIn(List values) { + addCriterion("gas_org_id not in", values, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdBetween(Long value1, Long value2) { + addCriterion("gas_org_id between", value1, value2, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdNotBetween(Long value1, Long value2) { + addCriterion("gas_org_id not between", value1, value2, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgNameIsNull() { + addCriterion("gas_org_name is null"); + return (Criteria) this; + } + + public Criteria andGasOrgNameIsNotNull() { + addCriterion("gas_org_name is not null"); + return (Criteria) this; + } + + public Criteria andGasOrgNameEqualTo(String value) { + addCriterion("gas_org_name =", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameNotEqualTo(String value) { + addCriterion("gas_org_name <>", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameGreaterThan(String value) { + addCriterion("gas_org_name >", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameGreaterThanOrEqualTo(String value) { + addCriterion("gas_org_name >=", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameLessThan(String value) { + addCriterion("gas_org_name <", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameLessThanOrEqualTo(String value) { + addCriterion("gas_org_name <=", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameLike(String value) { + addCriterion("gas_org_name like", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameNotLike(String value) { + addCriterion("gas_org_name not like", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameIn(List values) { + addCriterion("gas_org_name in", values, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameNotIn(List values) { + addCriterion("gas_org_name not in", values, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameBetween(String value1, String value2) { + addCriterion("gas_org_name between", value1, value2, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameNotBetween(String value1, String value2) { + addCriterion("gas_org_name not between", value1, value2, "gasOrgName"); + return (Criteria) this; + } + public Criteria andExt1IsNull() { addCriterion("ext_1 is null"); return (Criteria) this; diff --git a/hai-service/src/main/java/com/hai/entity/HighOrder.java b/hai-service/src/main/java/com/hai/entity/HighOrder.java index 911dd3ff..cf0c1f52 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrder.java @@ -175,6 +175,16 @@ public class HighOrder implements Serializable { private HighDiscount highDiscount; + private Boolean isTyAgent; + + public Boolean getIsTyAgent() { + return isTyAgent; + } + + public void setIsTyAgent(Boolean tyAgent) { + isTyAgent = tyAgent; + } + public List getHighChildOrderList() { return highChildOrderList; } diff --git a/hai-service/src/main/java/com/hai/model/TyOrderModel.java b/hai-service/src/main/java/com/hai/model/TyOrderModel.java new file mode 100644 index 00000000..94b24546 --- /dev/null +++ b/hai-service/src/main/java/com/hai/model/TyOrderModel.java @@ -0,0 +1,144 @@ +package com.hai.model; + +import java.math.BigDecimal; +import java.util.Date; + +public class TyOrderModel { + + private String orderNo; + private String payType; + private BigDecimal totalPrice; + private BigDecimal deductionPrice; + private BigDecimal payRealPrice; + private String goodsName; + private String gasOilNo; + private String gasGunNo; + private BigDecimal platformPrice; + private BigDecimal gasPriceGun; + private Date createTime; + private Date payTime; + + private String orgName; + private String agentName; + private String salesmanName; + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getAgentName() { + return agentName; + } + + public void setAgentName(String agentName) { + this.agentName = agentName; + } + + public String getSalesmanName() { + return salesmanName; + } + + public void setSalesmanName(String salesmanName) { + this.salesmanName = salesmanName; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getPayType() { + return payType; + } + + public void setPayType(String payType) { + this.payType = payType; + } + + public BigDecimal getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; + } + + public BigDecimal getDeductionPrice() { + return deductionPrice; + } + + public void setDeductionPrice(BigDecimal deductionPrice) { + this.deductionPrice = deductionPrice; + } + + public BigDecimal getPayRealPrice() { + return payRealPrice; + } + + public void setPayRealPrice(BigDecimal payRealPrice) { + this.payRealPrice = payRealPrice; + } + + public String getGoodsName() { + return goodsName; + } + + public void setGoodsName(String goodsName) { + this.goodsName = goodsName; + } + + public String getGasOilNo() { + return gasOilNo; + } + + public void setGasOilNo(String gasOilNo) { + this.gasOilNo = gasOilNo; + } + + public String getGasGunNo() { + return gasGunNo; + } + + public void setGasGunNo(String gasGunNo) { + this.gasGunNo = gasGunNo; + } + + public BigDecimal getPlatformPrice() { + return platformPrice; + } + + public void setPlatformPrice(BigDecimal platformPrice) { + this.platformPrice = platformPrice; + } + + public BigDecimal getGasPriceGun() { + return gasPriceGun; + } + + public void setGasPriceGun(BigDecimal gasPriceGun) { + this.gasPriceGun = gasPriceGun; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getPayTime() { + return payTime; + } + + public void setPayTime(Date payTime) { + this.payTime = payTime; + } +} diff --git a/hai-service/src/main/java/com/hai/service/HighTyAgentOilStationService.java b/hai-service/src/main/java/com/hai/service/HighTyAgentOilStationService.java index 1030785a..5db7ec8a 100644 --- a/hai-service/src/main/java/com/hai/service/HighTyAgentOilStationService.java +++ b/hai-service/src/main/java/com/hai/service/HighTyAgentOilStationService.java @@ -2,6 +2,7 @@ package com.hai.service; import com.hai.entity.HighTyAgentOilStation; import com.hai.model.TyAgentOilStationModel; +import com.hai.model.TyOrderModel; import java.util.List; import java.util.Map; @@ -77,4 +78,11 @@ public interface HighTyAgentOilStationService { * @param oilStationList */ void unbindSalesman(List oilStationList); + + /** + * 查询订单列表 + * @param param + * @return + */ + List getOrderList(Map param); } diff --git a/hai-service/src/main/java/com/hai/service/impl/HighTyAgentOilStationServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighTyAgentOilStationServiceImpl.java index 57caca46..b6bc745c 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighTyAgentOilStationServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighTyAgentOilStationServiceImpl.java @@ -6,6 +6,7 @@ import com.hai.common.exception.SysCode; import com.hai.dao.HighTyAgentOilStationMapper; import com.hai.entity.*; import com.hai.model.TyAgentOilStationModel; +import com.hai.model.TyOrderModel; import com.hai.service.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -182,4 +183,9 @@ public class HighTyAgentOilStationServiceImpl implements HighTyAgentOilStationSe } } + @Override + public List getOrderList(Map param) { + return tyAgentOilStationMapper.getOrderList(param); + } + } From 43bee2d6580cd91caa570ac7f66ee1be1a3b4223 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Sat, 2 Apr 2022 09:47:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4diam?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bweb/controller/SecUserController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/SecUserController.java b/hai-bweb/src/main/java/com/bweb/controller/SecUserController.java index 6ed33adb..6a87f752 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/SecUserController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/SecUserController.java @@ -54,7 +54,7 @@ public class SecUserController { @RequestMapping(value="/sendUserPass",method = RequestMethod.POST) @ResponseBody - @ApiOperation(value = "修改用户密码 {'userId':'','nonceStr':'','password':'','sign':''} ") + @ApiOperation(value = "修改用户密码 {'userId':'','nonceStr':'','newPassword':'','sign':''} ") public ResponseData sendUserPass(@RequestBody String reqBody, HttpServletRequest request, HttpServletResponse response) throws Exception{ try { @@ -62,7 +62,7 @@ public class SecUserController { Long userId = jsonObject.getLong("userId"); //用户Id String oldPassword = jsonObject.getString("oldPassword"); //旧密码 - String password = jsonObject.getString("password"); //密码 + String password = jsonObject.getString("newPassword"); //密码 if(userId == null || StringUtils.isBlank(oldPassword) || StringUtils.isBlank(password)) { log.error("BaseMemberController --> sendUserPass() error!","参数错误");