From 46a9f3349bf50974d3635991df39add8b3716f7e Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 27 Jun 2021 20:14:01 +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 --- .../bweb/controller/HighOrderController.java | 52 ++++++++++++++++ .../cweb/controller/HighGasController.java | 50 +++++++++++----- .../cweb/controller/HighOrderController.java | 13 ++-- .../com/hai/dao/HighChildOrderMapper.java | 35 ++++++----- .../hai/dao/HighChildOrderSqlProvider.java | 14 +++++ .../java/com/hai/dao/HighOrderMapperExt.java | 54 ++++++++++++++++- .../java/com/hai/entity/HighChildOrder.java | 18 +++++- .../com/hai/entity/HighChildOrderExample.java | 60 +++++++++++++++++++ .../java/com/hai/model/HighOrderModel.java | 9 +++ .../com/hai/service/HighOrderService.java | 2 + .../service/impl/HighOrderServiceImpl.java | 13 ++++ .../pay/impl/GoodsOrderServiceImpl.java | 9 ++- .../resources/dev/commonConfig.properties | 2 +- 13 files changed, 287 insertions(+), 44 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java index 72438da5..904a0054 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java @@ -242,4 +242,56 @@ public class HighOrderController { return ResponseMsgUtil.exception(e); } } + + + @RequestMapping(value = "/getGasOrderList", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询加油订单列表") + public ResponseData getGasOrderList(@RequestParam(name = "companyId", required = false) Long companyId, + @RequestParam(name = "merchantId", required = false) Long merchantId, + @RequestParam(name = "orderNo", required = false) String orderNo, + @RequestParam(name = "paySerialNo", required = false) String paySerialNo, + @RequestParam(name = "payModel", required = false) Integer payModel, + @RequestParam(name = "payType", required = false) Integer payType, + @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, + HttpServletRequest request) { + try { + + SessionObject sessionObject = userCenter.getSessionObject(request); + UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject(); + + Map map = new HashMap<>(); + // 用户来源 0:超级管理员 1:公司 2:商户 3:门店 4. 代理商 + if(userInfoModel.getSecUser().getObjectType() == 0) { + map.put("companyId", companyId); + + } else if (userInfoModel.getSecUser().getObjectType() == 1) { + map.put("companyId", userInfoModel.getBsCompany().getId()); + map.put("merchantId", merchantId); + + } else if (userInfoModel.getSecUser().getObjectType() == 2) { + map.put("merchantId", userInfoModel.getMerchant().getId()); + } + + map.put("orderNo", orderNo); + map.put("paySerialNo", paySerialNo); + map.put("payModel", payModel); + map.put("payType", payType); + map.put("orderStatus", orderStatus); + map.put("payTimeS", payTimeS); + map.put("payTimeE", payTimeE); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(highOrderService.getGasOrderModelList(map))); + + } catch (Exception e) { + log.error("HighOrderController --> getGasOrderList() error!", e); + return ResponseMsgUtil.exception(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 d5063013..2e854ac6 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java @@ -10,6 +10,8 @@ import com.hai.common.utils.PageUtil; 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.HighGasOrderPush; import com.hai.entity.HighOrder; import com.hai.model.ResponseData; import com.hai.service.HighGasOilPriceService; @@ -40,6 +42,9 @@ public class HighGasController { @Resource private HighOrderService highOrderService; + @Resource + private HighGasOrderPushMapper highGasOrderPushMapper; + @RequestMapping(value="/getGasStoreList",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询加油站列表") @@ -159,35 +164,48 @@ public class HighGasController { } } - /* @RequestMapping(value="/refuelingOrderPush",method = RequestMethod.GET) + @RequestMapping(value="/refuelingOrderPush",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "推送订单") public ResponseData refuelingOrderPush() { try { + // {"app_key":"208241666939552","gunNo":"1","refuelingAmount":"1.02","thirdSerialNo":"HF2021062716143174807","sign":"83c7e8f70b984a04b937b28b8652aded","driverPhone":"15583658692","gasId":"CS000116587","priceVip":"7.31","oilNo":"90","timestamp":1624781755439,"priceGun":"7.31"}" + + String dataStr = "{\"result\": { \"orderNo\": \"CS00011658721062717132106\"},\"code\": 200, \"message\": \"OK\" }"; Map map = new HashMap<>(); - map.put("gasId", "CS000116576"); - map.put("oilNo", "92"); + map.put("gasId", "CS000116587"); + map.put("oilNo", "90"); map.put("gunNo", 1); - BigDecimal priceGun = new BigDecimal("6"); - BigDecimal priceVip = new BigDecimal("4.9"); - //BigDecimal priceGun = new BigDecimal("5.58"); - //BigDecimal priceVip = new BigDecimal("5.58"); + BigDecimal priceGun = new BigDecimal("7.31"); + BigDecimal priceVip = new BigDecimal("7.31"); + // BigDecimal priceGun = new BigDecimal("5.58"); + // BigDecimal priceVip = new BigDecimal("5.40"); map.put("priceGun", priceGun); // 枪单价 map.put("priceVip", priceVip); // 优惠价 - map.put("driverPhone", "17726395120"); + map.put("driverPhone", "15583658692"); map.put("thirdSerialNo", new Date().getTime()); - - - BigDecimal refuelingAmount = new BigDecimal("1200").divide(priceGun,2,BigDecimal.ROUND_HALF_UP).multiply(priceVip).setScale(2,BigDecimal.ROUND_HALF_UP); + BigDecimal refuelingAmount = new BigDecimal("1").divide(priceGun,10,BigDecimal.ROUND_DOWN).multiply(priceVip).setScale(2,BigDecimal.ROUND_HALF_UP); map.put("refuelingAmount", refuelingAmount); - JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(map); + /*JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(map); if (orderPushObject == null || !orderPushObject.getString("code").equals("200")) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "提交订单,出现了未知错误"); } - JSONObject result = orderPushObject.getJSONObject("result"); - return ResponseMsgUtil.success(result.getString("orderNo")); - //return ResponseMsgUtil.success(map); + JSONObject result = orderPushObject.getJSONObject("result");*/ + //return ResponseMsgUtil.success(TuanYouConfig.refuelingOrderPush(map)); + JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(map); + // 推送团油订单记录 + HighGasOrderPush highGasOrderPush = new HighGasOrderPush(); + highGasOrderPush.setCreateTime(new Date()); + highGasOrderPush.setCode(orderPushObject.getString("code")); + highGasOrderPush.setRequestContent(JSONObject.toJSONString(map)); + highGasOrderPush.setReturnContent(orderPushObject.toJSONString()); + highGasOrderPushMapper.insert(highGasOrderPush); + + if (orderPushObject != null && orderPushObject.getString("code").equals("200")) { + return ResponseMsgUtil.success(orderPushObject.getJSONObject("result").getString("orderNo")); + } + return ResponseMsgUtil.success(map); } catch (Exception e) { @@ -229,6 +247,6 @@ public class HighGasController { log.error("HighGasController -> queryThirdOrderDretail() error!",e); return ResponseMsgUtil.exception(e); } - }*/ + } } 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 db4d953c..89023f4f 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java @@ -94,6 +94,7 @@ public class HighOrderController { } BigDecimal totalPrice = new BigDecimal("0"); + BigDecimal totalActualPrice = new BigDecimal("0"); for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) { if (childOrder.getGoodsType() == null || childOrder.getGoodsId() == null || childOrder.getSaleCount() == null) { log.error("HighOrderController --> addOrder() error!", "参数错误"); @@ -141,6 +142,7 @@ public class HighOrderController { log.error("HighOrderController --> addOrder() error!", "卡卷库存数量不足"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_STOCK_INSUFFICIENT, ""); } + childOrder.setGoodsActualPrice(childOrder.getGoodsPrice()); childOrder.setGoodsName(coupon.getCouponName()); childOrder.setGoodsImg(coupon.getCouponImg()); childOrder.setGoodsSpecName("默认"); @@ -157,7 +159,8 @@ public class HighOrderController { log.error("HighOrderController --> addOrder() error!", "未找到用户"); throw ErrorHelp.genException(SysCode.System, ErrorCode.UN_MEMBER_ERROR, ""); } - + highOrder.setPayType(2); // 第三方平台 + childOrder.setGoodsActualPrice(childOrder.getGoodsPrice()); childOrder.setGoodsName(user.getName()); childOrder.setGoodsImg(user.getHeaderImg()); childOrder.setGoodsSpecName("默认"); @@ -174,6 +177,7 @@ public class HighOrderController { log.error("HighOrderController --> addOrder() error!", "未找到门店信息"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到门店信息"); } + highOrder.setPayType(2); // 第三方平台 // 获取当前加油价格 JSONObject jsonObject = TuanYouConfig.queryCompanyPriceDetail(store.getStoreKey(), childOrder.getGasOilNo()); @@ -183,13 +187,12 @@ public class HighOrderController { if(jsonObject.getJSONArray("result").size() == 0) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未获取到加油价格"); } - JSONObject priceDetail = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.getJSONArray("result").get(0)), JSONObject.class); childOrder.setGoodsName(store.getStoreName()); childOrder.setGoodsImg(store.getStoreLogo()); childOrder.setGasPriceGun(priceDetail.getBigDecimal("priceGun")); childOrder.setGasPriceVip(priceDetail.getBigDecimal("priceVip")); - childOrder.setGoodsPrice(new BigDecimal(childOrder.getGoodsPrice().toString()).divide(childOrder.getGasPriceGun(),2,BigDecimal.ROUND_HALF_UP).multiply(childOrder.getGasPriceVip()).setScale(2,BigDecimal.ROUND_HALF_UP)); + childOrder.setGoodsActualPrice(new BigDecimal(childOrder.getGoodsPrice().toString()).divide(childOrder.getGasPriceGun(),10,BigDecimal.ROUND_DOWN).multiply(childOrder.getGasPriceVip()).setScale(2,BigDecimal.ROUND_HALF_UP)); childOrder.setGoodsSpecName("默认"); childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString()))); } @@ -202,10 +205,12 @@ public class HighOrderController { // 累计订单价格 totalPrice = totalPrice.add(childOrder.getTotalPrice()); + totalActualPrice = totalActualPrice.add(childOrder.getGoodsActualPrice()); } highOrder.setTotalPrice(totalPrice); - highOrder.setPayPrice(highOrder.getTotalPrice()); + highOrder.setPayPrice(totalActualPrice); + highOrder.setDeductionPrice(highOrder.getTotalPrice().subtract(totalActualPrice)); // 是否使用了优惠券 if (highDiscountUserRel != null) { 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 64edcb36..0d8ed3c8 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java @@ -43,22 +43,24 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "goods_type, goods_id, ", "goods_name, goods_img, ", "goods_spec_name, goods_price, ", - "sale_count, total_price, ", - "giveaway_type, child_orde_status, ", - "praise_status, gas_oil_no, ", - "gas_gun_no, gas_order_no, ", - "gas_price_gun, gas_price_vip, ", - "ext_1, ext_2, ext_3)", + "goods_actual_price, sale_count, ", + "total_price, giveaway_type, ", + "child_orde_status, praise_status, ", + "gas_oil_no, gas_gun_no, ", + "gas_order_no, gas_price_gun, ", + "gas_price_vip, ext_1, ", + "ext_2, ext_3)", "values (#{orderId,jdbcType=BIGINT}, #{memId,jdbcType=BIGINT}, ", "#{goodsType,jdbcType=INTEGER}, #{goodsId,jdbcType=BIGINT}, ", "#{goodsName,jdbcType=VARCHAR}, #{goodsImg,jdbcType=VARCHAR}, ", "#{goodsSpecName,jdbcType=VARCHAR}, #{goodsPrice,jdbcType=DECIMAL}, ", - "#{saleCount,jdbcType=INTEGER}, #{totalPrice,jdbcType=DECIMAL}, ", - "#{giveawayType,jdbcType=BIT}, #{childOrdeStatus,jdbcType=INTEGER}, ", - "#{praiseStatus,jdbcType=INTEGER}, #{gasOilNo,jdbcType=VARCHAR}, ", - "#{gasGunNo,jdbcType=VARCHAR}, #{gasOrderNo,jdbcType=VARCHAR}, ", - "#{gasPriceGun,jdbcType=DECIMAL}, #{gasPriceVip,jdbcType=DECIMAL}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{goodsActualPrice,jdbcType=DECIMAL}, #{saleCount,jdbcType=INTEGER}, ", + "#{totalPrice,jdbcType=DECIMAL}, #{giveawayType,jdbcType=BIT}, ", + "#{childOrdeStatus,jdbcType=INTEGER}, #{praiseStatus,jdbcType=INTEGER}, ", + "#{gasOilNo,jdbcType=VARCHAR}, #{gasGunNo,jdbcType=VARCHAR}, ", + "#{gasOrderNo,jdbcType=VARCHAR}, #{gasPriceGun,jdbcType=DECIMAL}, ", + "#{gasPriceVip,jdbcType=DECIMAL}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighChildOrder record); @@ -78,6 +80,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="goods_img", property="goodsImg", jdbcType=JdbcType.VARCHAR), @Result(column="goods_spec_name", property="goodsSpecName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_price", property="goodsPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="goods_actual_price", property="goodsActualPrice", jdbcType=JdbcType.DECIMAL), @Result(column="sale_count", property="saleCount", jdbcType=JdbcType.INTEGER), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT), @@ -97,9 +100,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Select({ "select", "id, order_id, mem_id, goods_type, goods_id, goods_name, goods_img, goods_spec_name, ", - "goods_price, sale_count, total_price, giveaway_type, child_orde_status, praise_status, ", - "gas_oil_no, gas_gun_no, gas_order_no, gas_price_gun, gas_price_vip, ext_1, ext_2, ", - "ext_3", + "goods_price, goods_actual_price, sale_count, total_price, giveaway_type, child_orde_status, ", + "praise_status, gas_oil_no, gas_gun_no, gas_order_no, gas_price_gun, gas_price_vip, ", + "ext_1, ext_2, ext_3", "from high_child_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -113,6 +116,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="goods_img", property="goodsImg", jdbcType=JdbcType.VARCHAR), @Result(column="goods_spec_name", property="goodsSpecName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_price", property="goodsPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="goods_actual_price", property="goodsActualPrice", jdbcType=JdbcType.DECIMAL), @Result(column="sale_count", property="saleCount", jdbcType=JdbcType.INTEGER), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT), @@ -148,6 +152,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "goods_img = #{goodsImg,jdbcType=VARCHAR},", "goods_spec_name = #{goodsSpecName,jdbcType=VARCHAR},", "goods_price = #{goodsPrice,jdbcType=DECIMAL},", + "goods_actual_price = #{goodsActualPrice,jdbcType=DECIMAL},", "sale_count = #{saleCount,jdbcType=INTEGER},", "total_price = #{totalPrice,jdbcType=DECIMAL},", "giveaway_type = #{giveawayType,jdbcType=BIT},", 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 88a5be32..2850133f 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java @@ -60,6 +60,10 @@ public class HighChildOrderSqlProvider { sql.VALUES("goods_price", "#{goodsPrice,jdbcType=DECIMAL}"); } + if (record.getGoodsActualPrice() != null) { + sql.VALUES("goods_actual_price", "#{goodsActualPrice,jdbcType=DECIMAL}"); + } + if (record.getSaleCount() != null) { sql.VALUES("sale_count", "#{saleCount,jdbcType=INTEGER}"); } @@ -130,6 +134,7 @@ public class HighChildOrderSqlProvider { sql.SELECT("goods_img"); sql.SELECT("goods_spec_name"); sql.SELECT("goods_price"); + sql.SELECT("goods_actual_price"); sql.SELECT("sale_count"); sql.SELECT("total_price"); sql.SELECT("giveaway_type"); @@ -196,6 +201,10 @@ public class HighChildOrderSqlProvider { sql.SET("goods_price = #{record.goodsPrice,jdbcType=DECIMAL}"); } + if (record.getGoodsActualPrice() != null) { + sql.SET("goods_actual_price = #{record.goodsActualPrice,jdbcType=DECIMAL}"); + } + if (record.getSaleCount() != null) { sql.SET("sale_count = #{record.saleCount,jdbcType=INTEGER}"); } @@ -265,6 +274,7 @@ public class HighChildOrderSqlProvider { sql.SET("goods_img = #{record.goodsImg,jdbcType=VARCHAR}"); sql.SET("goods_spec_name = #{record.goodsSpecName,jdbcType=VARCHAR}"); sql.SET("goods_price = #{record.goodsPrice,jdbcType=DECIMAL}"); + sql.SET("goods_actual_price = #{record.goodsActualPrice,jdbcType=DECIMAL}"); sql.SET("sale_count = #{record.saleCount,jdbcType=INTEGER}"); sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); sql.SET("giveaway_type = #{record.giveawayType,jdbcType=BIT}"); @@ -320,6 +330,10 @@ public class HighChildOrderSqlProvider { sql.SET("goods_price = #{goodsPrice,jdbcType=DECIMAL}"); } + if (record.getGoodsActualPrice() != null) { + sql.SET("goods_actual_price = #{goodsActualPrice,jdbcType=DECIMAL}"); + } + if (record.getSaleCount() != null) { sql.SET("sale_count = #{saleCount,jdbcType=INTEGER}"); } 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 484fbca0..e9922955 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java @@ -95,7 +95,7 @@ public interface HighOrderMapperExt { @Select({""}) List selectGoodsOrderList(@Param("map") Map map); + + @Select({""}) + List selectGasOrderList(@Param("map") Map map); + } 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 0d8f6685..6e12b19d 100644 --- a/hai-service/src/main/java/com/hai/entity/HighChildOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighChildOrder.java @@ -58,6 +58,11 @@ public class HighChildOrder implements Serializable { */ private BigDecimal goodsPrice; + /** + * 商品的实际价格 + */ + private BigDecimal goodsActualPrice; + /** * 商品的数量 */ @@ -74,7 +79,7 @@ public class HighChildOrder implements Serializable { private Boolean giveawayType; /** - * 子订单状态:1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 + * 子订单状态:1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 */ private Integer childOrdeStatus; @@ -188,6 +193,14 @@ public class HighChildOrder implements Serializable { this.goodsPrice = goodsPrice; } + public BigDecimal getGoodsActualPrice() { + return goodsActualPrice; + } + + public void setGoodsActualPrice(BigDecimal goodsActualPrice) { + this.goodsActualPrice = goodsActualPrice; + } + public Integer getSaleCount() { return saleCount; } @@ -313,6 +326,7 @@ public class HighChildOrder implements Serializable { && (this.getGoodsImg() == null ? other.getGoodsImg() == null : this.getGoodsImg().equals(other.getGoodsImg())) && (this.getGoodsSpecName() == null ? other.getGoodsSpecName() == null : this.getGoodsSpecName().equals(other.getGoodsSpecName())) && (this.getGoodsPrice() == null ? other.getGoodsPrice() == null : this.getGoodsPrice().equals(other.getGoodsPrice())) + && (this.getGoodsActualPrice() == null ? other.getGoodsActualPrice() == null : this.getGoodsActualPrice().equals(other.getGoodsActualPrice())) && (this.getSaleCount() == null ? other.getSaleCount() == null : this.getSaleCount().equals(other.getSaleCount())) && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice())) && (this.getGiveawayType() == null ? other.getGiveawayType() == null : this.getGiveawayType().equals(other.getGiveawayType())) @@ -341,6 +355,7 @@ public class HighChildOrder implements Serializable { result = prime * result + ((getGoodsImg() == null) ? 0 : getGoodsImg().hashCode()); result = prime * result + ((getGoodsSpecName() == null) ? 0 : getGoodsSpecName().hashCode()); result = prime * result + ((getGoodsPrice() == null) ? 0 : getGoodsPrice().hashCode()); + result = prime * result + ((getGoodsActualPrice() == null) ? 0 : getGoodsActualPrice().hashCode()); result = prime * result + ((getSaleCount() == null) ? 0 : getSaleCount().hashCode()); result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode()); result = prime * result + ((getGiveawayType() == null) ? 0 : getGiveawayType().hashCode()); @@ -372,6 +387,7 @@ public class HighChildOrder implements Serializable { sb.append(", goodsImg=").append(goodsImg); sb.append(", goodsSpecName=").append(goodsSpecName); sb.append(", goodsPrice=").append(goodsPrice); + sb.append(", goodsActualPrice=").append(goodsActualPrice); sb.append(", saleCount=").append(saleCount); sb.append(", totalPrice=").append(totalPrice); sb.append(", giveawayType=").append(giveawayType); 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 2e2f35ca..87bc2a78 100644 --- a/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java @@ -695,6 +695,66 @@ public class HighChildOrderExample { return (Criteria) this; } + public Criteria andGoodsActualPriceIsNull() { + addCriterion("goods_actual_price is null"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceIsNotNull() { + addCriterion("goods_actual_price is not null"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceEqualTo(BigDecimal value) { + addCriterion("goods_actual_price =", value, "goodsActualPrice"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceNotEqualTo(BigDecimal value) { + addCriterion("goods_actual_price <>", value, "goodsActualPrice"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceGreaterThan(BigDecimal value) { + addCriterion("goods_actual_price >", value, "goodsActualPrice"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("goods_actual_price >=", value, "goodsActualPrice"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceLessThan(BigDecimal value) { + addCriterion("goods_actual_price <", value, "goodsActualPrice"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("goods_actual_price <=", value, "goodsActualPrice"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceIn(List values) { + addCriterion("goods_actual_price in", values, "goodsActualPrice"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceNotIn(List values) { + addCriterion("goods_actual_price not in", values, "goodsActualPrice"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("goods_actual_price between", value1, value2, "goodsActualPrice"); + return (Criteria) this; + } + + public Criteria andGoodsActualPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("goods_actual_price not between", value1, value2, "goodsActualPrice"); + return (Criteria) this; + } + public Criteria andSaleCountIsNull() { addCriterion("sale_count is null"); return (Criteria) this; diff --git a/hai-service/src/main/java/com/hai/model/HighOrderModel.java b/hai-service/src/main/java/com/hai/model/HighOrderModel.java index 43c9a233..deb7e2bd 100644 --- a/hai-service/src/main/java/com/hai/model/HighOrderModel.java +++ b/hai-service/src/main/java/com/hai/model/HighOrderModel.java @@ -5,6 +5,7 @@ import java.util.Date; public class HighOrderModel { + private Long orderId; private String merchantName; private String goodsType; private String goodsName; @@ -31,6 +32,14 @@ public class HighOrderModel { private Integer goodsTypeId; private Integer orderStatusId; + public Long getOrderId() { + return orderId; + } + + public void setOrderId(Long orderId) { + this.orderId = orderId; + } + public Integer getOrderStatusId() { return orderStatusId; } 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 3535e159..5cb0e4d9 100644 --- a/hai-service/src/main/java/com/hai/service/HighOrderService.java +++ b/hai-service/src/main/java/com/hai/service/HighOrderService.java @@ -117,6 +117,8 @@ public interface HighOrderService { * @return */ List getGoodsOrderModelList(Map map) throws Exception; + + List getGasOrderModelList(Map map) throws Exception; /** * @Author 胡锐 * @Description 查询需要关闭的订单列表 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 db0dc291..30b1d404 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 @@ -368,6 +368,19 @@ public class HighOrderServiceImpl implements HighOrderService { return highOrderMapper.selectGoodsOrderList(map); } + @Override + public List getGasOrderModelList(Map map) throws Exception { + if(MapUtils.getLong(map, "payTimeS") != null) { + map.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeS")), "yyyy-MM-dd HH:mm:ss")); + } + + if(MapUtils.getLong(map, "payTimeE") != null) { + map.put("payTimeE", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeE")), "yyyy-MM-dd HH:mm:ss")); + } + + return highOrderMapper.selectGasOrderList(map); + } + @Override public List getCloseOrder() { return highOrderMapperExt.getCloseOrder(); diff --git a/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java index cc1829b3..c923d44a 100644 --- a/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java @@ -149,22 +149,21 @@ public class GoodsOrderServiceImpl implements PayService { paramMap.put("priceVip", priceVip); // 优惠价 paramMap.put("driverPhone", order.getMemPhone()); paramMap.put("thirdSerialNo", order.getOrderNo()); - paramMap.put("refuelingAmount", highChildOrder.getGoodsPrice()); + paramMap.put("refuelingAmount", highChildOrder.getGoodsActualPrice()); JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(paramMap); - + System.out.println(orderPushObject.toJSONString()); // 推送团油订单记录 HighGasOrderPush highGasOrderPush = new HighGasOrderPush(); highGasOrderPush.setCreateTime(new Date()); highGasOrderPush.setCode(orderPushObject.getString("code")); highGasOrderPush.setRequestContent(JSONObject.toJSONString(paramMap)); - highGasOrderPush.setReturnContent(orderPushObject.getJSONObject("result").toJSONString()); + highGasOrderPush.setReturnContent(orderPushObject.toJSONString()); highGasOrderPushMapper.insert(highGasOrderPush); - if (orderPushObject != null || orderPushObject.getString("code").equals("200")) { + if (orderPushObject != null && orderPushObject.getString("code").equals("200")) { highChildOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo")); } - highOrderService.updateChildOrder(highChildOrder); } } diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties index cc1dc27d..5ef1ac20 100644 --- a/hai-service/src/main/resources/dev/commonConfig.properties +++ b/hai-service/src/main/resources/dev/commonConfig.properties @@ -2,4 +2,4 @@ tuanYouUrl=https://test02-motorcade-hcs.czb365.com tuanYouAppKey=208241666939552 tuanYouAppSecret=adecc3cff077834cb8632c8ab3bec0e6 -wx_cert=/home/pro ect/wx_cert/ \ No newline at end of file +wx_cert=/home/project/wx_cert/ \ No newline at end of file