修改代码

袁野 3 years ago
parent 52bd873660
commit cebe26da2b
  1. 2
      hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java
  2. 2
      hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
  3. 2
      hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
  4. 2
      hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
  5. 1
      hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java
  6. 11
      hai-cweb/src/main/java/com/cweb/controller/HighUserController.java
  7. 2
      hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
  8. 11
      hai-cweb/src/main/java/com/cweb/controller/WechatController.java
  9. 21
      hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
  10. 5
      hai-service/src/main/java/com/hai/common/exception/ErrorCode.java
  11. 27
      hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
  12. 191
      hai-service/src/main/java/com/hai/model/SelfOilStationModel.java
  13. 7
      hai-service/src/main/java/com/hai/service/HighOrderService.java
  14. 4
      hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java
  15. 5
      hai-service/src/main/java/com/hai/service/impl/HighDiscountPackageServiceImpl.java
  16. 6
      hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
  17. 1
      hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
  18. 1
      v1/src/main/java/com/v1/config/AuthConfig.java
  19. 36
      v1/src/main/java/com/v1/config/ToolConfig.java
  20. 32
      v1/src/main/java/com/v1/controller/RechargeProductController.java
  21. 116
      v1/src/main/java/com/v1/controller/SelfOilStationController.java
  22. 18
      v1/src/main/java/com/v1/controller/ThirdPartyController.java

@ -271,6 +271,8 @@ public class HighCouponController {
coupon.setDiscountPrice(highCoupon.getDiscountPrice()); coupon.setDiscountPrice(highCoupon.getDiscountPrice());
coupon.setIsPresent(highCoupon.getIsPresent()); coupon.setIsPresent(highCoupon.getIsPresent());
coupon.setOperatorId(userInfoModel.getSecUser().getId()); coupon.setOperatorId(userInfoModel.getSecUser().getId());
coupon.setGoodsTypeId(highCoupon.getGoodsTypeId());
coupon.setBrandId(highCoupon.getBrandId());
coupon.setOperatorName(userInfoModel.getSecUser().getUserName()); coupon.setOperatorName(userInfoModel.getSecUser().getUserName());
coupon.setUpdateTime(new Date()); coupon.setUpdateTime(new Date());
coupon.setStatus(3); // 状态:0.删除 1.编辑中 2.已上架 3.已下架 101.上架审批中 102.上架审批驳回 coupon.setStatus(3); // 状态:0.删除 1.编辑中 2.已上架 3.已下架 101.上架审批中 102.上架审批驳回

File diff suppressed because one or more lines are too long

@ -399,7 +399,7 @@ public class HighOrderController {
totalPrice = totalPrice.add(childOrder.getTotalPrice()); totalPrice = totalPrice.add(childOrder.getTotalPrice());
totalActualPrice = totalActualPrice.add(childOrder.getGoodsActualPrice()); totalActualPrice = totalActualPrice.add(childOrder.getGoodsActualPrice());
} }
highOrder.setMerchId(request.getHeader("mchId"));
highOrder.setTotalPrice(totalPrice); highOrder.setTotalPrice(totalPrice);
highOrder.setPayPrice(totalActualPrice); highOrder.setPayPrice(totalActualPrice);
highOrder.setDeductionPrice(highOrder.getTotalPrice().subtract(totalActualPrice)); highOrder.setDeductionPrice(highOrder.getTotalPrice().subtract(totalActualPrice));

File diff suppressed because one or more lines are too long

@ -324,6 +324,7 @@ public class HighThirdPartyController {
} }
object.put("userId", userInfoModel.getHighUser().getId()); object.put("userId", userInfoModel.getHighUser().getId());
object.put("mchId", request.getHeader("mchId"));
return ResponseMsgUtil.success(highOrderService.insertThirdProduct(object)); return ResponseMsgUtil.success(highOrderService.insertThirdProduct(object));

@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Objects;
/** /**
* @Auther: 袁野 * @Auther: 袁野
@ -183,12 +184,10 @@ public class HighUserController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_SET_USER_PAY_PWD, ""); throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_SET_USER_PAY_PWD, "");
} }
// 获取手机号验证码
VerifyCode verifyCode = VerifyCodeStorage.getDate(userInfoModel.getHighUser().getPhone()); String phoneSmsCode = (String) redisUtil.get("SMS_"+ userInfoModel.getHighUser().getPhone());
if (verifyCode != null && verifyCode.getObject().equals(body.getString("code"))) { // 验证码校验
// 清除记录,验证码只能验证一次 if (StringUtils.isNotBlank(phoneSmsCode) && Objects.equals(phoneSmsCode,body.getString("code"))) {
VerifyCodeStorage.remove(userInfoModel.getHighUser().getPhone());
userPayPassword.setPassword(AESEncodeUtil.aesEncrypt(body.getString("newPassword"))); userPayPassword.setPassword(AESEncodeUtil.aesEncrypt(body.getString("newPassword")));
highUserPayPasswordService.editUserPayPwd(userPayPassword); highUserPayPasswordService.editUserPayPwd(userPayPassword);
return ResponseMsgUtil.success("操作成功"); return ResponseMsgUtil.success("操作成功");

@ -53,6 +53,7 @@ public class OutRechargeOrderController {
HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject();
if (StringUtils.isBlank(object.getString("rechargeContent")) || if (StringUtils.isBlank(object.getString("rechargeContent")) ||
object.getLong("goodsId") == null object.getLong("goodsId") == null
) { ) {
@ -60,6 +61,7 @@ public class OutRechargeOrderController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
} }
object.put("mchId", request.getHeader("mchId"));
object.put("userId", userInfoModel.getHighUser().getId()); object.put("userId", userInfoModel.getHighUser().getId());
return ResponseMsgUtil.success(outRechargeOrderService.insertOrder(object)); return ResponseMsgUtil.success(outRechargeOrderService.insertOrder(object));

@ -14,8 +14,7 @@ import com.github.pagehelper.PageInfo;
import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode; import com.hai.common.exception.SysCode;
import com.hai.common.security.SessionObject; import com.hai.common.security.*;
import com.hai.common.security.UserCenter;
import com.hai.common.utils.HttpsUtils; import com.hai.common.utils.HttpsUtils;
import com.hai.common.utils.IDGenerator; import com.hai.common.utils.IDGenerator;
import com.hai.common.utils.RedisUtil; import com.hai.common.utils.RedisUtil;
@ -248,14 +247,18 @@ public class WechatController {
@ResponseBody @ResponseBody
@ApiOperation(value = "根据手机号码登陆") @ApiOperation(value = "根据手机号码登陆")
public ResponseData loginByTel(@RequestParam(value = "phone", required = true) String phone, public ResponseData loginByTel(@RequestParam(value = "phone", required = true) String phone,
@RequestParam(value = "code", required = true) String code,
HttpServletRequest request, HttpServletResponse response) { HttpServletRequest request, HttpServletResponse response) {
try { try {
// 根据手机号查询用户 // 根据手机号查询用户
HighUser user = highUserService.findByPhone(phone); HighUser user = highUserService.findByPhone(phone);
// 获取手机号验证码
String phoneSmsCode = (String) redisUtil.get("SMS_"+ phone);
// 验证码校验 // 验证码校验
if (StringUtils.isNotBlank(phoneSmsCode) && Objects.equals(phoneSmsCode,code)) {
// 定义个人所有数据 // 定义个人所有数据
HighUserModel highUserModel = new HighUserModel(); HighUserModel highUserModel = new HighUserModel();
HighUser detailData = highUserService.getDetailDataByUser(user.getId()); HighUser detailData = highUserService.getDetailDataByUser(user.getId());
@ -264,6 +267,10 @@ public class WechatController {
SessionObject so = new SessionObject(user.getPhone(), 1, highUserModel); SessionObject so = new SessionObject(user.getPhone(), 1, highUserModel);
userCenter.save(request, response, so); userCenter.save(request, response, so);
return ResponseMsgUtil.success(so); return ResponseMsgUtil.success(so);
} else {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "验证码错误");
}
} catch (Exception e) { } catch (Exception e) {

@ -393,6 +393,26 @@ public class CzOrderController {
} }
@RequestMapping(value="/apiCallBack",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "apiCallBack")
public String test(@RequestBody String reqBodyStr) {
try {
if (StringUtils.isBlank(reqBodyStr)) {
log.error("orderToPay error!", "参数错误");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
System.out.println("reqBodyStr");
return "SUCCESS";
} catch (Exception e) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
}
@RequestMapping(value="/orderToPayByWx",method = RequestMethod.POST) @RequestMapping(value="/orderToPayByWx",method = RequestMethod.POST)
@ResponseBody @ResponseBody
@ -583,6 +603,5 @@ public class CzOrderController {
apiOrderRecord.setRequestTime(new Date()); apiOrderRecord.setRequestTime(new Date());
apiOrderRecordService.updateOrderRecord(apiOrderRecord); apiOrderRecordService.updateOrderRecord(apiOrderRecord);
} }
} }

@ -130,13 +130,14 @@ public enum ErrorCode {
REQUEST_TIMED_OUT("3006","请求超时,请稍后重试"), REQUEST_TIMED_OUT("3006","请求超时,请稍后重试"),
SIGN_VERIFY("6001","签名校验失败"), SIGN_VERIFY("6001","签名校验失败"),
ACCOUNT_NOT_EXIST("6002","账号不存在"), ACCOUNT_NOT_EXIST("6002","帐户不存在"),
PHONE_ERROR("6003","手机号码格式有误"), PHONE_ERROR("6003","手机号码格式有误"),
INSUFFICIENT_BALANCE("6006","账户余额不足,请及时充值"), INSUFFICIENT_BALANCE("6006","账户余额不足,请及时充值"),
ORDER_ALREADY_EXISTS("6007","订单已存在"), ORDER_ALREADY_EXISTS("6007","订单已存在"),
IP_ERROR("6008","IP不在白名单"), IP_ERROR("6008","IP不在白名单"),
PRODUCT_ERROR("6009","商品错误"), PRODUCT_ERROR("6009","商品错误"),
MERCHANT_NOT_AUTHORIZED("6010","商户无权限"), MERCHANT_NOT_AUTHORIZED("6010","帐户无权限"),
TIME_OUT("6011","请求时间超时"),
MSG_EVENT_NULL("2999","消息类型为空"), MSG_EVENT_NULL("2999","消息类型为空"),
USE_VISIT_ILLEGAL("4001","用户身份错误"), USE_VISIT_ILLEGAL("4001","用户身份错误"),

@ -1219,4 +1219,31 @@ public interface HighOrderMapperExt {
"</script>" "</script>"
}) })
Map<String, Object> countGasStoreOrder(@Param("param") Map<String, Object> param); Map<String, Object> countGasStoreOrder(@Param("param") Map<String, Object> param);
@Select({
"<script>",
"select",
"order_no , goods_name as oil_station_name , gas_staff_name , gas_oil_type , gas_oil_no ,gas_gun_no , gas_price_official , gas_price_gun , gas_oil_liters , b.total_price as gas_price , mem_phone as user_phone , pay_time ,create_time , order_status ",
"from high_order a join high_child_order b on a.id = b.order_id where ",
" b.goods_id in (${goodsId}) ",
" group by a.order_no ",
"</script>"
})
@Results({
@Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
@Result(column="oil_station_name", property="oilStationName", jdbcType=JdbcType.VARCHAR),
@Result(column="gas_staff_name", property="gasStaffName", jdbcType=JdbcType.VARCHAR),
@Result(column="gas_oil_type", property="gasOilType", 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_price_official", property="gasPriceOfficial", jdbcType=JdbcType.DECIMAL),
@Result(column="gas_price_gun", property="gasPriceGun", jdbcType=JdbcType.DECIMAL),
@Result(column="gas_oil_liters", property="gasOilLiters", jdbcType=JdbcType.DECIMAL),
@Result(column="gas_price", property="gasPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="order_status", property="orderStatus", jdbcType=JdbcType.INTEGER),
})
List<SelfOilStationModel> getSelfOilStationOrderList(@Param("goodsId") String goodsId);
} }

@ -0,0 +1,191 @@
package com.hai.model;
import java.math.BigDecimal;
import java.util.Date;
public class SelfOilStationModel {
/**
* 订单流水号
*/
private String orderNo;
/**
* 油站名称
*/
private String oilStationName;
/**
* 加油站加油员名称
*/
private String gasStaffName;
/**
* 加油站油品类型 1:汽油:2:柴油;3:天然气
*/
private Integer gasOilType;
/**
* 加油站油号
*/
private String gasOilNo;
/**
* 加油站油抢号
*/
private String gasGunNo;
/**
* 加油站国标价
*/
private BigDecimal gasPriceOfficial;
/**
* 加油站油枪价
*/
private BigDecimal gasPriceGun;
/**
* 加油站加油升数
*/
private BigDecimal gasOilLiters;
/**
* 加油站加油金额
*/
private BigDecimal gasPrice;
/**
* 用户电话
*/
private String userPhone;
/**
* 支付时间
*/
private Date payTime;
/**
* 生成时间
*/
private Date createTime;
/**
* 订单状态1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 6.退款中 7.拒绝退款
*/
private Integer orderStatus;
public String getOrderNo() {
return orderNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public String getOilStationName() {
return oilStationName;
}
public void setOilStationName(String oilStationName) {
this.oilStationName = oilStationName;
}
public String getGasStaffName() {
return gasStaffName;
}
public void setGasStaffName(String gasStaffName) {
this.gasStaffName = gasStaffName;
}
public Integer getGasOilType() {
return gasOilType;
}
public void setGasOilType(Integer gasOilType) {
this.gasOilType = gasOilType;
}
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 getGasPriceOfficial() {
return gasPriceOfficial;
}
public void setGasPriceOfficial(BigDecimal gasPriceOfficial) {
this.gasPriceOfficial = gasPriceOfficial;
}
public BigDecimal getGasPriceGun() {
return gasPriceGun;
}
public void setGasPriceGun(BigDecimal gasPriceGun) {
this.gasPriceGun = gasPriceGun;
}
public BigDecimal getGasOilLiters() {
return gasOilLiters;
}
public void setGasOilLiters(BigDecimal gasOilLiters) {
this.gasOilLiters = gasOilLiters;
}
public BigDecimal getGasPrice() {
return gasPrice;
}
public void setGasPrice(BigDecimal gasPrice) {
this.gasPrice = gasPrice;
}
public String getUserPhone() {
return userPhone;
}
public void setUserPhone(String userPhone) {
this.userPhone = userPhone;
}
public Date getPayTime() {
return payTime;
}
public void setPayTime(Date payTime) {
this.payTime = payTime;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Integer getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(Integer orderStatus) {
this.orderStatus = orderStatus;
}
}

@ -527,4 +527,11 @@ public interface HighOrderService {
* @return void * @return void
**/ **/
void thirdCancelOrder(Long orderId); void thirdCancelOrder(Long orderId);
/**
* 查询自建站列表
* @param goodsId
* @return
*/
List<SelfOilStationModel> getSelfOilStationOrderList(String goodsId);
} }

@ -394,11 +394,7 @@ public class ApiProductServiceImpl implements ApiProductService {
List<ApiKfcStores> apiKfcStores = apiKfcStoresMapper.selectByExample(example); List<ApiKfcStores> apiKfcStores = apiKfcStoresMapper.selectByExample(example);
if (apiKfcStores.size() > 0) { if (apiKfcStores.size() > 0) {
<<<<<<< HEAD
return apiKfcStores.get(0); return apiKfcStores.get(0);
=======
return apiKfcStores.get(0);
>>>>>>> master
} }
return null; return null;
} }

@ -249,11 +249,6 @@ public class HighDiscountPackageServiceImpl implements HighDiscountPackageServic
// 设置库存 // 设置库存
highDiscountPackage.setTotalStock(totalStock + num); highDiscountPackage.setTotalStock(totalStock + num);
highDiscountPackageMapper.updateByPrimaryKey(highDiscountPackage); highDiscountPackageMapper.updateByPrimaryKey(highDiscountPackage);
// 设置库存
highDiscountPackage.setTotalStock(totalStock + num);
highDiscountPackageMapper.updateByPrimaryKey(highDiscountPackage);
} }

@ -1917,6 +1917,7 @@ public class HighOrderServiceImpl implements HighOrderService {
highOrder.setCompanyId(object.getLong("companyId")); highOrder.setCompanyId(object.getLong("companyId"));
highOrder.setCreateTime(new Date()); highOrder.setCreateTime(new Date());
highOrder.setMemId(user.getId()); highOrder.setMemId(user.getId());
highOrder.setMerchId(object.getString("mchId"));
highOrder.setMemName(user.getName()); highOrder.setMemName(user.getName());
highOrder.setMemPhone(user.getPhone()); highOrder.setMemPhone(user.getPhone());
highOrder.setOrderStatus(1); highOrder.setOrderStatus(1);
@ -2585,4 +2586,9 @@ public class HighOrderServiceImpl implements HighOrderService {
} }
} }
@Override
public List<SelfOilStationModel> getSelfOilStationOrderList(String goodsId) {
return highOrderMapper.getSelfOilStationOrderList(goodsId);
}
} }

@ -313,6 +313,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
outRechargeOrder.setOrderNo("RCG" + DateUtil.date2String(new Date(), "yyyyMMddHHmmss") + IDGenerator.nextId(5)); outRechargeOrder.setOrderNo("RCG" + DateUtil.date2String(new Date(), "yyyyMMddHHmmss") + IDGenerator.nextId(5));
outRechargeOrder.setCreateTimed(new Date()); outRechargeOrder.setCreateTimed(new Date());
outRechargeOrder.setGoodsId(goodsId); outRechargeOrder.setGoodsId(goodsId);
outRechargeOrder.setMerchId(object.getString("mchId"));
outRechargeOrder.setRechargePrice(outRechargePrice.getRechargePrice()); outRechargeOrder.setRechargePrice(outRechargePrice.getRechargePrice());
if (object.getLong("memDiscountId") != null) { if (object.getLong("memDiscountId") != null) {
outRechargeOrder.setPayPrice(outRechargePrice.getRechargePrice()); outRechargeOrder.setPayPrice(outRechargePrice.getRechargePrice());

@ -93,6 +93,7 @@ public class AuthConfig implements WebMvcConfigurer {
.excludePathPatterns("/rechargeProduct/*") .excludePathPatterns("/rechargeProduct/*")
.excludePathPatterns("/gzSinopec/*") .excludePathPatterns("/gzSinopec/*")
.excludePathPatterns("/thirdParty/*") .excludePathPatterns("/thirdParty/*")
.excludePathPatterns("/selfOilStation/*")
; ;
} }

@ -0,0 +1,36 @@
package com.v1.config;
import java.util.Date;
/**
* @serviceName ToolConfig.java
* @author Sum1Dream
* @version 1.0.0
* @Description // 对外接口 方法类
* @createTime 10:03 2022/7/26
**/
public class ToolConfig {
/**
* @Author Sum1Dream
* @name timetableCheck.java
* @Description // 时间戳校验
* @Date 10:08 2022/7/26
* @Param [java.lang.Long, java.lang.Long]
* @return java.lang.Boolean
*/
public static Boolean timetableCheck(Long minNum , Long timetable) {
long nd = 1000 * 24 * 60 * 60;
long nh = 1000 * 60 * 60;
long nm = 1000 * 60;
// 获得两个时间的毫秒时间差异
long diff = new Date().getTime() - timetable;
// 计算差多少分钟
long min = diff % nd % nh / nm;
return min <= minNum;
}
}

@ -8,6 +8,7 @@ import com.hai.common.utils.ResponseMsgUtil;
import com.hai.entity.*; import com.hai.entity.*;
import com.hai.model.ResponseData; import com.hai.model.ResponseData;
import com.hai.service.*; import com.hai.service.*;
import com.v1.config.ToolConfig;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.MapUtils; import org.apache.commons.collections4.MapUtils;
@ -54,6 +55,9 @@ public class RechargeProductController {
@Resource @Resource
private ApiOpenService apiOpenService; private ApiOpenService apiOpenService;
@Resource
private HighOrderService highOrderService;
@RequestMapping(value = "/getRechargeProduct", method = RequestMethod.POST) @RequestMapping(value = "/getRechargeProduct", method = RequestMethod.POST)
@ResponseBody @ResponseBody
@ApiOperation(value = "获取充值产品") @ApiOperation(value = "获取充值产品")
@ -74,6 +78,7 @@ public class RechargeProductController {
} }
if (StringUtils.isBlank(object.getString("apiKey")) || if (StringUtils.isBlank(object.getString("apiKey")) ||
StringUtils.isBlank(object.getString("timetable")) ||
StringUtils.isBlank(object.getString("merchId")) || StringUtils.isBlank(object.getString("merchId")) ||
StringUtils.isBlank(object.getString("sign")) || StringUtils.isBlank(object.getString("sign")) ||
object.getInteger("rechargeType") == null object.getInteger("rechargeType") == null
@ -90,6 +95,7 @@ public class RechargeProductController {
} }
Map<String , Object> map = new HashMap<>(); Map<String , Object> map = new HashMap<>();
map.put("timetable" , object.getString("timetable"));
map.put("apiKey" , object.getString("apiKey")); map.put("apiKey" , object.getString("apiKey"));
map.put("merchId" , object.getString("merchId")); map.put("merchId" , object.getString("merchId"));
map.put("rechargeType" , object.getString("rechargeType")); map.put("rechargeType" , object.getString("rechargeType"));
@ -99,6 +105,11 @@ public class RechargeProductController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY); throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY);
} }
if (!ToolConfig.timetableCheck(15L , object.getLong("timetable"))) {
log.error("getRechargeProduct error!", "请求时间超过15分钟!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY);
}
return ResponseMsgUtil.success(apiMerchantsService.getMerchProduct(apiMerchants.getId() , object.getInteger("rechargeType"))); return ResponseMsgUtil.success(apiMerchantsService.getMerchProduct(apiMerchants.getId() , object.getInteger("rechargeType")));
} catch (Exception e) { } catch (Exception e) {
@ -128,6 +139,7 @@ public class RechargeProductController {
if (StringUtils.isBlank(object.getString("apiKey")) || if (StringUtils.isBlank(object.getString("apiKey")) ||
StringUtils.isBlank(object.getString("merchId")) || StringUtils.isBlank(object.getString("merchId")) ||
StringUtils.isBlank(object.getString("timetable")) ||
StringUtils.isBlank(object.getString("sign")) StringUtils.isBlank(object.getString("sign"))
) { ) {
log.error("getRechargeProduct error!", "请求参数校验失败!"); log.error("getRechargeProduct error!", "请求参数校验失败!");
@ -143,6 +155,7 @@ public class RechargeProductController {
Map<String , Object> map = new HashMap<>(); Map<String , Object> map = new HashMap<>();
map.put("apiKey" , object.getString("apiKey")); map.put("apiKey" , object.getString("apiKey"));
map.put("timetable" , object.getString("timetable"));
map.put("merchId" , object.getString("merchId")); map.put("merchId" , object.getString("merchId"));
if (!secConfigService.isSignVerify(map , object.getString("sign"))) { if (!secConfigService.isSignVerify(map , object.getString("sign"))) {
@ -150,6 +163,11 @@ public class RechargeProductController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY); throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY);
} }
if (!ToolConfig.timetableCheck(15L , object.getLong("timetable"))) {
log.error("getRechargeProduct error!", "请求时间超过15分钟!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY);
}
return ResponseMsgUtil.success(apiMerchants.getAmounts()); return ResponseMsgUtil.success(apiMerchants.getAmounts());
} catch (Exception e) { } catch (Exception e) {
@ -178,6 +196,7 @@ public class RechargeProductController {
} }
if (StringUtils.isBlank(object.getString("apiKey")) || if (StringUtils.isBlank(object.getString("apiKey")) ||
StringUtils.isBlank(object.getString("timetable")) ||
StringUtils.isBlank(object.getString("merchId")) || StringUtils.isBlank(object.getString("merchId")) ||
StringUtils.isBlank(object.getString("sign")) || StringUtils.isBlank(object.getString("sign")) ||
StringUtils.isBlank(object.getString("sourceOrderNo")) StringUtils.isBlank(object.getString("sourceOrderNo"))
@ -195,6 +214,7 @@ public class RechargeProductController {
Map<String , Object> map = new HashMap<>(); Map<String , Object> map = new HashMap<>();
map.put("apiKey" , object.getString("apiKey")); map.put("apiKey" , object.getString("apiKey"));
map.put("timetable" , object.getString("timetable"));
map.put("merchId" , object.getString("merchId")); map.put("merchId" , object.getString("merchId"));
map.put("sourceOrderNo" , object.getString("sourceOrderNo")); map.put("sourceOrderNo" , object.getString("sourceOrderNo"));
@ -203,6 +223,10 @@ public class RechargeProductController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY); throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY);
} }
if (!ToolConfig.timetableCheck(15L , object.getLong("timetable"))) {
log.error("getRechargeProduct error!", "请求时间超过15分钟!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY);
}
ApiOrderRecord apiOrderRecord = apiOrderRecordService.queryOrderResult(map); ApiOrderRecord apiOrderRecord = apiOrderRecordService.queryOrderResult(map);
@ -254,6 +278,7 @@ public class RechargeProductController {
if (StringUtils.isBlank(object.getString("mobile")) || if (StringUtils.isBlank(object.getString("mobile")) ||
StringUtils.isBlank(object.getString("apiConfigProductId")) || StringUtils.isBlank(object.getString("apiConfigProductId")) ||
StringUtils.isBlank(object.getString("apiKey")) || StringUtils.isBlank(object.getString("apiKey")) ||
StringUtils.isBlank(object.getString("timetable")) ||
StringUtils.isBlank(object.getString("orderNo")) || StringUtils.isBlank(object.getString("orderNo")) ||
StringUtils.isBlank(object.getString("notifyUrl")) || StringUtils.isBlank(object.getString("notifyUrl")) ||
StringUtils.isBlank(object.getString("sign")) || StringUtils.isBlank(object.getString("sign")) ||
@ -285,6 +310,7 @@ public class RechargeProductController {
Map<String , Object> map = new HashMap<>(); Map<String , Object> map = new HashMap<>();
map.put("mobile" , object.getString("mobile")); map.put("mobile" , object.getString("mobile"));
map.put("apiConfigProductId" , object.getString("apiConfigProductId")); map.put("apiConfigProductId" , object.getString("apiConfigProductId"));
map.put("timetable" , object.getString("timetable"));
map.put("orderNo" , object.getString("orderNo")); map.put("orderNo" , object.getString("orderNo"));
map.put("notifyUrl" , object.getString("notifyUrl")); map.put("notifyUrl" , object.getString("notifyUrl"));
map.put("apiKey" , object.getString("apiKey")); map.put("apiKey" , object.getString("apiKey"));
@ -294,6 +320,12 @@ public class RechargeProductController {
log.error("createOrder error!", "签名校验失败!"); log.error("createOrder error!", "签名校验失败!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY); throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY);
} }
if (!ToolConfig.timetableCheck(15L , object.getLong("timetable"))) {
log.error("getRechargeProduct error!", "请求时间超过15分钟!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY);
}
apiOpenService.createOrder(object , apiMerchants , apiProductConfig); apiOpenService.createOrder(object , apiMerchants , apiProductConfig);
return ResponseMsgUtil.success("下单成功"); return ResponseMsgUtil.success("下单成功");

@ -0,0 +1,116 @@
package com.v1.controller;
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.utils.ResponseMsgUtil;
import com.hai.entity.ApiMerchants;
import com.hai.entity.HighOrder;
import com.hai.entity.SecConfig;
import com.hai.model.ResponseData;
import com.hai.model.SelfOilStationModel;
import com.hai.service.*;
import com.v1.config.ToolConfig;
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.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@RequestMapping(value = "/selfOilStation")
@Api(value = "自建站接口")
public class SelfOilStationController {
private static Logger log = LoggerFactory.getLogger(SelfOilStationController.class);
@Resource
private ApiMerchantsService apiMerchantsService;
@Resource
private SecConfigService secConfigService;
@Resource
private HighOrderService highOrderService;
@RequestMapping(value = "/getSelfOilStationOrderList", method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "获取自建站订单")
public ResponseData getSelfOilStationOrderList(@RequestBody JSONObject object , HttpServletRequest request ) {
try {
String ip = "";
// 有的user可能使用代理,为处理用户使用代理的情况,使用x-forwarded-for
if (request.getHeader("x-forwarded-for") == null) {
ip = request.getRemoteAddr();
} else {
ip = request.getHeader("x-forwarded-for");
}
if (!secConfigService.isConfig("IP_WHITE" , ip)) {
log.error("getRechargeProduct error!", "非法ip地址,请联系管理人员!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址,请联系管理人员!");
}
if (StringUtils.isBlank(object.getString("apiKey")) ||
StringUtils.isBlank(object.getString("timetable")) ||
StringUtils.isBlank(object.getString("merchId")) ||
StringUtils.isBlank(object.getString("sign"))
) {
log.error("getRechargeProduct error!", "请求参数校验失败!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR);
}
ApiMerchants apiMerchants = apiMerchantsService.findByMchId(object.getString("merchId"));
if (apiMerchants == null) {
log.error("getRechargeProduct error!", "错误商户,请联系管理人员!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_NOT_EXIST);
}
Map<String , Object> map = new HashMap<>();
map.put("timetable" , object.getString("timetable"));
map.put("apiKey" , object.getString("apiKey"));
map.put("merchId" , object.getString("merchId"));
if (!secConfigService.isSignVerify(map , object.getString("sign"))) {
log.error("getRechargeProduct error!", "签名校验失败!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY);
}
if (!secConfigService.isConfig("SELF_OIL_STATION_CONFIG" , object.getString("merchId"))) {
log.error("getAllCities error!", "当前帐户无权限!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前帐户无权限!");
}
if (!ToolConfig.timetableCheck(15L , object.getLong("timetable"))) {
log.error("getRechargeProduct error!", "请求时间超过15分钟!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY);
}
SecConfig config = secConfigService.findByCodeType(object.getString("merchId"));
return ResponseMsgUtil.success(highOrderService.getSelfOilStationOrderList(config.getCodeValue()));
} catch (Exception e) {
log.error("HighOpenApiController --> getRechargeProduct() error!", e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -75,13 +75,13 @@ public class ThirdPartyController {
ApiMerchants apiMerchants = apiMerchantsService.findByMchId(object.getString("merchId")); ApiMerchants apiMerchants = apiMerchantsService.findByMchId(object.getString("merchId"));
if (apiMerchants == null) { if (apiMerchants == null) {
log.error("getRechargeProduct error!", "户号错误!"); log.error("getRechargeProduct error!", "户号错误!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_NOT_EXIST); throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_NOT_EXIST);
} }
if (!secConfigService.isConfig("KFC_CONFIG" , object.getString("merchId"))) { if (!secConfigService.isConfig("KFC_CONFIG" , object.getString("merchId"))) {
log.error("getAllCities error!", "当前户无权限查询!"); log.error("getAllCities error!", "当前户无权限查询!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前户无权限查询!"); throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前户无权限查询!");
} }
Map<String , Object> map = new HashMap<>(); Map<String , Object> map = new HashMap<>();
@ -135,13 +135,13 @@ public class ThirdPartyController {
ApiMerchants apiMerchants = apiMerchantsService.findByMchId(object.getString("merchId")); ApiMerchants apiMerchants = apiMerchantsService.findByMchId(object.getString("merchId"));
if (apiMerchants == null) { if (apiMerchants == null) {
log.error("getRechargeProduct error!", "户号错误!"); log.error("getRechargeProduct error!", "户号错误!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_NOT_EXIST); throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_NOT_EXIST);
} }
if (!secConfigService.isConfig("KFC_CONFIG" , object.getString("merchId"))) { if (!secConfigService.isConfig("KFC_CONFIG" , object.getString("merchId"))) {
log.error("getAllCities error!", "当前户无权限查询!"); log.error("getAllCities error!", "当前户无权限查询!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前户无权限查询!"); throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前户无权限查询!");
} }
Map<String , Object> map = new HashMap<>(); Map<String , Object> map = new HashMap<>();
@ -202,13 +202,13 @@ public class ThirdPartyController {
ApiMerchants apiMerchants = apiMerchantsService.findByMchId(object.getString("merchId")); ApiMerchants apiMerchants = apiMerchantsService.findByMchId(object.getString("merchId"));
if (apiMerchants == null) { if (apiMerchants == null) {
log.error("getRechargeProduct error!", "户号错误!"); log.error("getRechargeProduct error!", "户号错误!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_NOT_EXIST); throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_NOT_EXIST);
} }
if (!secConfigService.isConfig("KFC_CONFIG" , object.getString("merchId"))) { if (!secConfigService.isConfig("KFC_CONFIG" , object.getString("merchId"))) {
log.error("getAllCities error!", "当前户无权限查询!"); log.error("getAllCities error!", "当前户无权限查询!");
throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前户无权限查询!"); throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前户无权限查询!");
} }
Map<String , Object> map = new HashMap<>(); Map<String , Object> map = new HashMap<>();

Loading…
Cancel
Save