From 74068c087057f815b7573256052f9285082a8529 Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 25 Jun 2021 00:26:04 +0800 Subject: [PATCH 1/9] =?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 --- .../cweb/controller/HighGasController.java | 62 +++++- .../cweb/controller/HighOrderController.java | 54 ++++- .../controller/pay/TuanYouController.java | 60 +++++ .../com/hai/dao/HighChildOrderMapper.java | 21 +- .../hai/dao/HighChildOrderSqlProvider.java | 42 ++++ .../com/hai/dao/HighGasOilPriceMapperExt.java | 6 +- .../java/com/hai/entity/HighChildOrder.java | 50 ++++- .../com/hai/entity/HighChildOrderExample.java | 210 ++++++++++++++++++ 8 files changed, 493 insertions(+), 12 deletions(-) create mode 100644 hai-cweb/src/main/java/com/cweb/controller/pay/TuanYouController.java 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 10eeba06..0d6b43ad 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -74,11 +75,16 @@ public class HighGasController { @RequestMapping(value="/getGasDetailByStoreKey",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "根据门店key 查询") - public ResponseData getGasDetailByStoreKey(@RequestParam(name = "storeKey", required = true) String storeKey) { + public ResponseData getGasDetailByStoreKey(@RequestParam(name = "storeKey", required = true) String storeKey, + @RequestParam(name = "longitude", required = true) String longitude, + @RequestParam(name = "latitude", required = true) String latitude) { try { JSONObject jsonObject = TuanYouConfig.queryGasInfoByGasId(storeKey); if (jsonObject != null && jsonObject.getString("code").equals("200")) { + JSONObject result = jsonObject.getJSONObject("result"); + double distance = CoordCommonUtil.getDistance(Double.valueOf(result.get("gasAddressLatitude").toString()), Double.valueOf(result.get("gasAddressLongitude").toString()), Double.valueOf(latitude), Double.valueOf(longitude)); + result.put("distance", Math.round(distance/100d)/10d); return ResponseMsgUtil.success(jsonObject.get("result")); } throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未获取到加油站信息"); @@ -111,4 +117,58 @@ public class HighGasController { } } + @RequestMapping(value="/refuelingOrderPush",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "推送订单") + public ResponseData refuelingOrderPush() { + try { + + Map map = new HashMap<>(); + map.put("gasId", "CS000116576"); + map.put("oilNo", "92"); + 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"); + map.put("priceGun", priceGun); // 枪单价 + map.put("priceVip", priceVip); // 优惠价 + map.put("driverPhone", "17726395120"); + 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); + map.put("refuelingAmount", refuelingAmount); + 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); + + + } catch (Exception e) { + log.error("HighGasController -> refuelingOrderPush() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/queryThirdOrderDretail",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "推送订单") + public ResponseData queryThirdOrderDretail() { + try { + + + return ResponseMsgUtil.success(TuanYouConfig.queryThirdOrderDretail("1624541593196")); + //return ResponseMsgUtil.success(map); + + + } catch (Exception e) { + 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 4c08dc7e..10d3f8ac 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java @@ -1,5 +1,7 @@ package com.cweb.controller; +import com.alibaba.fastjson.JSONObject; +import com.cweb.config.TuanYouConfig; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hai.common.exception.ErrorCode; @@ -12,11 +14,13 @@ import com.hai.common.utils.IDGenerator; import com.hai.common.utils.ResponseMsgUtil; import com.hai.entity.*; import com.hai.model.HighCouponModel; +import com.hai.model.HighMerchantStoreModel; import com.hai.model.HighUserModel; import com.hai.model.ResponseData; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -49,6 +53,9 @@ public class HighOrderController { @Resource private HighCouponService highCouponService; + @Resource + private HighMerchantStoreService highMerchantStoreService; + @Resource private HighCouponCodeService highCouponCodeService; @@ -94,7 +101,7 @@ public class HighOrderController { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } - // 商品类型 1:卡卷 2:金币充值 + // 商品类型 1:卡卷 2:金币充值 3:团油【加油站】 if (childOrder.getGoodsType() == 1) { if (childOrder.getSaleCount() != 1) { log.error("HighOrderController --> addOrder() error!", "卡卷只能购买一张"); @@ -157,6 +164,51 @@ public class HighOrderController { childOrder.setGoodsSpecName("默认"); } + if (childOrder.getGoodsType() == 3) { + if (childOrder.getGoodsPrice() == null || StringUtils.isBlank(childOrder.getGasGunNo()) || StringUtils.isBlank(childOrder.getGasOilNo())) { + log.error("HighOrderController --> addOrder() error!", "参数错误"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + // 查询门店 + HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(childOrder.getId()); + if (store == null) { + log.error("HighOrderController --> addOrder() error!", "未找到门店信息"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到门店信息"); + } + childOrder.setGoodsName(store.getStoreName()); + childOrder.setGoodsImg(store.getStoreLogo()); + childOrder.setGoodsSpecName("默认"); + childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString()))); + + // 获取当前加油价格 + JSONObject jsonObject = TuanYouConfig.queryCompanyPriceDetail(store.getStoreKey(), childOrder.getGasOilNo()); + if (jsonObject == null || !jsonObject.getString("code").equals("200")) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未获取到加油价格"); + } + 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); + // 推送订单 + Map map = new HashMap<>(); + map.put("gasId", store.getStoreKey()); + map.put("oilNo", childOrder.getGasOilNo()); + map.put("gunNo", childOrder.getGasGunNo()); + BigDecimal priceGun = new BigDecimal(priceDetail.getString("priceGun")); + BigDecimal priceVip = new BigDecimal(priceDetail.getString("priceVip")); + map.put("priceGun", priceGun); // 枪单价 + map.put("priceVip", priceVip); // 优惠价 + map.put("driverPhone", userInfoModel.getHighUser().getPhone()); + map.put("thirdSerialNo", highOrder.getOrderNo()); + BigDecimal refuelingAmount = new BigDecimal(childOrder.getTotalPrice().toString()).divide(priceGun,2,BigDecimal.ROUND_HALF_UP).multiply(priceVip).setScale(2,BigDecimal.ROUND_HALF_UP); + map.put("refuelingAmount", refuelingAmount); + JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(map); + if (orderPushObject == null || !orderPushObject.getString("code").equals("200")) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "提交订单,出现了未知错误"); + } + childOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo")); + } + childOrder.setMemId(userInfoModel.getHighUser().getId()); childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString()))); childOrder.setGiveawayType(false); // 是否是赠品 0:否 1:是 diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/TuanYouController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/TuanYouController.java new file mode 100644 index 00000000..22cbfddd --- /dev/null +++ b/hai-cweb/src/main/java/com/cweb/controller/pay/TuanYouController.java @@ -0,0 +1,60 @@ +package com.cweb.controller.pay; + +import com.alibaba.fastjson.JSONObject; +import com.cweb.config.SysConst; +import com.hai.common.pay.WechatPayUtil; +import com.hai.common.pay.util.IOUtil; +import com.hai.common.pay.util.XmlUtil; +import com.hai.common.pay.util.sdk.WXPayConstants; +import com.hai.common.utils.HttpsUtils; +import com.hai.common.utils.ResponseMsgUtil; +import com.hai.common.utils.WxUtils; +import com.hai.model.ResponseData; +import com.hai.model.WxSharingReceiversVO; +import com.hai.service.HighProfitSharingRecordService; +import com.hai.service.TelApiService; +import com.hai.service.pay.NotifyService; +import com.hai.service.pay.PayRecordService; +import com.wechat.pay.contrib.apache.httpclient.util.PemUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.BufferedOutputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.UnsupportedEncodingException; +import java.security.*; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; +import java.util.SortedMap; + +@Controller +@RequestMapping(value = "/ty") +@Api(value = "团油回调") +public class TuanYouController { + + private static Logger log = LoggerFactory.getLogger(TuanYouController.class); + + + @RequestMapping(value = "/orderPaymentNotify", method = RequestMethod.POST) + @ApiOperation(value = "订单支付回调") + public void orderPaymentNotify(HttpServletRequest request, HttpServletResponse response) { + try { + + + } catch (Exception e) { + log.error("WechatPayController --> wechatNotify() error!", e); + } + } +} 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 a4c0ad75..f2cdfd98 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java @@ -45,16 +45,18 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "goods_spec_name, goods_price, ", "sale_count, total_price, ", "giveaway_type, child_orde_status, ", - "praise_status, ext_1, ", - "ext_2, ext_3)", + "praise_status, gas_oil_no, ", + "gas_gun_no, gas_order_no, ", + "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}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{praiseStatus,jdbcType=INTEGER}, #{gasOilNo,jdbcType=VARCHAR}, ", + "#{gasGunNo,jdbcType=VARCHAR}, #{gasOrderNo,jdbcType=VARCHAR}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighChildOrder record); @@ -79,6 +81,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT), @Result(column="child_orde_status", property="childOrdeStatus", jdbcType=JdbcType.INTEGER), @Result(column="praise_status", property="praiseStatus", jdbcType=JdbcType.INTEGER), + @Result(column="gas_oil_no", property="gasOilNo", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_gun_no", property="gasGunNo", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_order_no", property="gasOrderNo", 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) @@ -89,7 +94,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "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, ", - "ext_1, ext_2, ext_3", + "gas_oil_no, gas_gun_no, gas_order_no, ext_1, ext_2, ext_3", "from high_child_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -108,6 +113,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT), @Result(column="child_orde_status", property="childOrdeStatus", jdbcType=JdbcType.INTEGER), @Result(column="praise_status", property="praiseStatus", jdbcType=JdbcType.INTEGER), + @Result(column="gas_oil_no", property="gasOilNo", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_gun_no", property="gasGunNo", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_order_no", property="gasOrderNo", 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) @@ -138,6 +146,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "giveaway_type = #{giveawayType,jdbcType=BIT},", "child_orde_status = #{childOrdeStatus,jdbcType=INTEGER},", "praise_status = #{praiseStatus,jdbcType=INTEGER},", + "gas_oil_no = #{gasOilNo,jdbcType=VARCHAR},", + "gas_gun_no = #{gasGunNo,jdbcType=VARCHAR},", + "gas_order_no = #{gasOrderNo,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 8e488550..5e715443 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java @@ -80,6 +80,18 @@ public class HighChildOrderSqlProvider { sql.VALUES("praise_status", "#{praiseStatus,jdbcType=INTEGER}"); } + if (record.getGasOilNo() != null) { + sql.VALUES("gas_oil_no", "#{gasOilNo,jdbcType=VARCHAR}"); + } + + if (record.getGasGunNo() != null) { + sql.VALUES("gas_gun_no", "#{gasGunNo,jdbcType=VARCHAR}"); + } + + if (record.getGasOrderNo() != null) { + sql.VALUES("gas_order_no", "#{gasOrderNo,jdbcType=VARCHAR}"); + } + if (record.getExt1() != null) { sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); } @@ -115,6 +127,9 @@ public class HighChildOrderSqlProvider { sql.SELECT("giveaway_type"); sql.SELECT("child_orde_status"); sql.SELECT("praise_status"); + sql.SELECT("gas_oil_no"); + sql.SELECT("gas_gun_no"); + sql.SELECT("gas_order_no"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); sql.SELECT("ext_3"); @@ -191,6 +206,18 @@ public class HighChildOrderSqlProvider { sql.SET("praise_status = #{record.praiseStatus,jdbcType=INTEGER}"); } + if (record.getGasOilNo() != null) { + sql.SET("gas_oil_no = #{record.gasOilNo,jdbcType=VARCHAR}"); + } + + if (record.getGasGunNo() != null) { + sql.SET("gas_gun_no = #{record.gasGunNo,jdbcType=VARCHAR}"); + } + + if (record.getGasOrderNo() != null) { + sql.SET("gas_order_no = #{record.gasOrderNo,jdbcType=VARCHAR}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); } @@ -225,6 +252,9 @@ public class HighChildOrderSqlProvider { sql.SET("giveaway_type = #{record.giveawayType,jdbcType=BIT}"); sql.SET("child_orde_status = #{record.childOrdeStatus,jdbcType=INTEGER}"); sql.SET("praise_status = #{record.praiseStatus,jdbcType=INTEGER}"); + sql.SET("gas_oil_no = #{record.gasOilNo,jdbcType=VARCHAR}"); + sql.SET("gas_gun_no = #{record.gasGunNo,jdbcType=VARCHAR}"); + sql.SET("gas_order_no = #{record.gasOrderNo,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}"); @@ -290,6 +320,18 @@ public class HighChildOrderSqlProvider { sql.SET("praise_status = #{praiseStatus,jdbcType=INTEGER}"); } + if (record.getGasOilNo() != null) { + sql.SET("gas_oil_no = #{gasOilNo,jdbcType=VARCHAR}"); + } + + if (record.getGasGunNo() != null) { + sql.SET("gas_gun_no = #{gasGunNo,jdbcType=VARCHAR}"); + } + + if (record.getGasOrderNo() != null) { + sql.SET("gas_order_no = #{gasOrderNo,jdbcType=VARCHAR}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java index 2c4a4d86..54bda4cb 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java @@ -1,11 +1,7 @@ package com.hai.dao; -import com.hai.entity.HighCouponRecycle; 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.List; import java.util.Map; @@ -18,6 +14,8 @@ public interface HighGasOilPriceMapperExt { @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 From 9e50b531a42d6e17d3720f69e6c13ddb887cbd22 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 27 Jun 2021 22:58:10 +0800 Subject: [PATCH 9/9] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cweb/controller/HighMerchantStoreController.java | 1 + .../java/com/hai/service/impl/HighMerchantServiceImpl.java | 5 +++++ .../main/java/com/hai/service/impl/HighOrderServiceImpl.java | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighMerchantStoreController.java b/hai-cweb/src/main/java/com/cweb/controller/HighMerchantStoreController.java index 1e687f58..20e84d62 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighMerchantStoreController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighMerchantStoreController.java @@ -144,6 +144,7 @@ public class HighMerchantStoreController { Map map = new HashMap<>(); map.put("companyId", bsCompany.getId()); map.put("status", 1); + map.put("ext1", true); return ResponseMsgUtil.success(highMerchantService.getMerchantList(map)); } return ResponseMsgUtil.success(new ArrayList<>()); diff --git a/hai-service/src/main/java/com/hai/service/impl/HighMerchantServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighMerchantServiceImpl.java index ba5e8b4d..711cb97e 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighMerchantServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighMerchantServiceImpl.java @@ -124,6 +124,11 @@ public class HighMerchantServiceImpl implements HighMerchantService { criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); } + // todo + if (MapUtils.getBoolean(map, "ext1") == true) { + criteria.andExt1IsNull(); + } + example.setOrderByClause("create_time desc"); return highMerchantMapper.selectByExample(example); } 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 30b1d404..003dd7f2 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 @@ -14,6 +14,8 @@ import com.hai.model.HighOrderData; import com.hai.model.HighOrderModel; import com.hai.service.*; import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.util.StringUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -327,7 +329,7 @@ public class HighOrderServiceImpl implements HighOrderService { criteria.andMemIdEqualTo(MapUtils.getLong(map, "memId")); } - if (MapUtils.getString(map, "status") != null) { + if (StringUtils.isNotBlank(MapUtils.getString(map, "status"))) { String[] statuses = MapUtils.getString(map, "status").split(","); List list = new ArrayList<>(); for (String status : statuses) {