hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: hurui:2.0-master
Branches Tags
hurui:2.0-dev
hurui:2.0-master
hurui:dev-discount
hurui:master
hurui:new-dev
..
compare: hurui:master
Branches Tags
hurui:2.0-dev
hurui:2.0-master
hurui:dev-discount
hurui:master
hurui:new-dev

1 Commits
2.0-master ... master

Author SHA1 Message Date
袁野 67e71fd697 Merge branch 'new-dev' into 2.0-dev
7 months ago
20 changed files with 81 additions and 486 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 3
      hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java
  2. 1
      hai-cweb/src/main/java/com/cweb/config/AuthConfig.java
  3. 90
      hai-cweb/src/main/java/com/cweb/controller/Etc/EtcCustomerController.java
  4. 10
      hai-order/src/main/java/com/web/controller/OrderPayNotifyController.java
  5. 4
      hai-schedule/src/main/java/com/hai/schedule/EtcSchedule.java
  6. 5
      hai-service/src/main/java/com/hai/config/CommonSysConfig.java
  7. 3
      hai-service/src/main/java/com/hai/config/EtcService.java
  8. 23
      hai-service/src/main/java/com/hai/dao/EtcContractOrderMapper.java
  9. 56
      hai-service/src/main/java/com/hai/dao/EtcContractOrderSqlProvider.java
  10. 66
      hai-service/src/main/java/com/hai/entity/EtcContractOrder.java
  11. 250
      hai-service/src/main/java/com/hai/entity/EtcContractOrderExample.java
  12. 3
      hai-service/src/main/java/com/hai/entity/HighCoupon.java
  13. 3
      hai-service/src/main/java/com/hai/etc/impl/EtcCarMsgServiceImpl.java
  14. 6
      hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
  15. 5
      hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
  16. 18
      hai-service/src/main/java/com/hai/pay/channel/huift/TradeService.java
  17. 8
      hai-service/src/main/java/com/hai/pay/channel/huift/config/HuiftConfig.java
  18. 2
      hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
  19. 6
      hai-service/src/main/resources/dev/commonConfig.properties
  20. 3
      hai-service/src/main/resources/prod/commonConfig.properties

3
hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java
Unescape View File

@ -247,7 +247,7 @@ public class EtcCustomerController {
@ResponseBody
@ApiOperation(value = "查询车辆列表")
public ResponseData getEtcCarMsgList(
@RequestParam(value = "vehPlateNo", required = false) String vehPlateNo, HttpServletRequest request
@RequestParam(value = "vehPlateNo", required = false) String vehPlateNo,@RequestParam(value = "custId", required = false) String custId , HttpServletRequest request
) {
try {
@ -258,6 +258,7 @@ public class EtcCustomerController {
map.put("userId", userInfoModel.getSecUser().getId());
map.put("vehPlateNo", vehPlateNo);
map.put("custId", custId);
List<EtcCarMsg> list = etcCarMsgService.getEtcCarList(map);

1
hai-cweb/src/main/java/com/cweb/config/AuthConfig.java
Unescape View File

@ -149,6 +149,7 @@ public class AuthConfig implements WebMvcConfigurer {
.excludePathPatterns("/highThirdParty/*")
.excludePathPatterns("/group/*")
.excludePathPatterns("/couponCodeOther/*")
.excludePathPatterns("/etcCustomer/getEquity")
;
}

90
hai-cweb/src/main/java/com/cweb/controller/Etc/EtcCustomerController.java
Unescape View File

@ -8,16 +8,13 @@ import com.hai.common.security.SessionObject;
import com.hai.common.security.UserCenter;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.config.EtcService;
import com.hai.entity.EtcCarMsg;
import com.hai.entity.EtcContractOrder;
import com.hai.entity.EtcCustMsg;
import com.hai.entity.SecDictionary;
import com.hai.entity.*;
import com.hai.etc.EtcCarMsgService;
import com.hai.etc.EtcCustMsgService;
import com.hai.model.HighUserModel;
import com.hai.model.ResponseData;
import com.hai.model.UserInfoModel;
import com.hai.service.CommonService;
import com.hai.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
@ -44,6 +41,15 @@ public class EtcCustomerController {
@Resource
private EtcCarMsgService etcCarMsgService;
@Resource
private SecConfigService secConfigService;
@Resource
private HighDiscountPackageService highDiscountPackageService;
@Resource
private HighDiscountPackageDetailsService highDiscountPackageDetailsService;
@RequestMapping(value = "/getEtcCarMsgList", method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询车辆列表")
@ -123,36 +129,6 @@ public class EtcCustomerController {
) {
try {
EtcContractOrder contractOrder = etcCarMsgService.findContractOrderById(id);
if (contractOrder == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到合同！");
}
// 查询车辆信息
Map<String , Object> mapCar = new HashMap<>();
mapCar.put("vehId" , contractOrder.getVehId());
mapCar.put("custId" , contractOrder.getCustId());
EtcCarMsg carMsg = etcCarMsgService.findEtcCarByMap(mapCar);
if (carMsg == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到信息！");
}
// 查询车辆状态
JSONObject car = EtcService.getVehStatus(carMsg);
if (car.getString("errCode").equals("0")) {
carMsg.setVehStatus(car.getJSONObject("result").getInteger("vehStatus"));
carMsg.setPayStatus(car.getJSONObject("result").getInteger("payStatus"));
carMsg.setSignStatus(car.getJSONObject("result").getInteger("signStatus"));
contractOrder.setVehStatus(carMsg.getVehStatus());
etcCarMsgService.updateEtcCar(carMsg);
}
// 查询微信签约代扣信息
return ResponseMsgUtil.success(etcCarMsgService.findContractOrderById(id));
} catch (Exception e) {
@ -218,6 +194,7 @@ public class EtcCustomerController {
carMsg.setSignStatus(1);
carMsg.setUpdateTime(new Date());
carMsg.setVehStatus(15);
etcCarMsgService.updateEtcCar(carMsg);
@ -270,12 +247,16 @@ public class EtcCustomerController {
@RequestParam(value = "type", required = true) Integer type) {
try {
EtcContractOrder contractOrder = etcCarMsgService.findContractOrderById(contractId);
if (contractOrder == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单不存在！");
}
if (type == 1) {
JSONObject object = EtcService.checkNeedSignWechatWithhold( contractOrder.getProductId() , contractOrder.getCardVarietyId());
JSONObject object = EtcService.checkNeedSignWechatWithhold( contractOrder.getProductId() , contractOrder.getCardVarietyId() , contractOrder.getVehId());
if (object.getString("errCode").equals("0")) {
return ResponseMsgUtil.success(object.getJSONObject("result"));
} else {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, object.getString("errMsg"));
@ -339,6 +320,8 @@ public class EtcCustomerController {
public ResponseData signWithhold(@RequestBody JSONObject object, HttpServletRequest request) {
try {
System.out.println(object);
if (object.getString("custId") == null ||
object.getString("cardNo") == null ||
object.getInteger("bankCardType") == null ||
@ -368,7 +351,40 @@ public class EtcCustomerController {
}
}
@RequestMapping(value = "/getEquity", method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "获取权益")
public ResponseData getEquity() {
try {
// 查询赠送优惠券
SecConfig secConfig = secConfigService.findByCodeType("GIVE_DISCOUNT_PACKAGE");
// 获取卡券数量
String[] discountPackageId = secConfig.getCodeValue().split(",");
List<JSONObject> list = new ArrayList<>();
for (String id : discountPackageId) {
JSONObject jsonObject = new JSONObject();
HighDiscountPackage discountPackage = highDiscountPackageService.findDiscountPackageById(Integer.valueOf(id));
if (discountPackage != null) {
jsonObject.put("packageDetail", discountPackage);
// 查询包内的优惠券
List<HighDiscountPackageDetails> detailsList = highDiscountPackageDetailsService.getDetailByPackage(Integer.valueOf(id));
jsonObject.put("discountList", detailsList);
list.add(jsonObject);
}
}
return ResponseMsgUtil.success(list);
} catch (Exception e) {
log.error("HighUserController --> findByUserId() error!", e);
return ResponseMsgUtil.exception(e);
}
}
}

10
hai-order/src/main/java/com/web/controller/OrderPayNotifyController.java
Unescape View File

@ -28,8 +28,6 @@ import javax.servlet.http.HttpServletResponse;
import java.io.BufferedOutputStream;
import java.math.BigDecimal;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;
import java.util.SortedMap;
/**
@ -140,7 +138,7 @@ public class OrderPayNotifyController {
if (StringUtils.isNotBlank(params)) {
// 参数解码
String paramsStr = URLDecoder.decode(params,"utf-8");
JSONObject body = JSONObject.parseObject(paramsStr);
JSONObject body = JSONObject.parseObject(paramsStr.substring(0, paramsStr.length() - 1));
log.info("开始处理订单： " + body.getString("outTradeNo"));
// 查询订单信息
@ -148,13 +146,11 @@ public class OrderPayNotifyController {
if (order != null && order.getOrderStatus().equals(OrderStatus.STATUS1.getNumber())) {
log.info("开始处理业务");
// 处理订单业务
Map<String,Object> other = new HashMap<>();
other.put("payChannelOrderNo", order.getPayChannelOrderNo());
paySuccessService.orderPaySuccessHandle(order.getOrderNo(),
OrderPayType.PAY_TYPE10,
body.getString("bankTraceNo"),
body.getString("orderNo"),
order.getPayPrice(),
null,other);
null,null);
}
log.info("处理业务完成");
}

4
hai-schedule/src/main/java/com/hai/schedule/EtcSchedule.java
Unescape View File

@ -44,7 +44,7 @@ public class EtcSchedule {
* @Date 14:18 2022/5/31
* @Param []
*/
@Scheduled(cron = "0 0/10 * * * ?") //每10分钟执行一次
@Scheduled(cron = "0 0/2 * * * ?") //每10分钟执行一次
public void getEtcCarList() {
try {
@ -70,7 +70,7 @@ public class EtcSchedule {
}
@Scheduled(cron = "0 0/60 * * * ?") //每60分钟执行一次
@Scheduled(cron = "0 0/10 * * * ?") //每60分钟执行一次
public void etcCarMsg() {
try {

5
hai-service/src/main/java/com/hai/config/CommonSysConfig.java
Unescape View File

@ -89,11 +89,6 @@ public class CommonSysConfig {
private String unionStagingPayOrgTermNo;
private String unionStagingPayNotifyUrl;
// 贵行V家园小程序支付
private String huiftReqUrl;
private String huiftShopCode;
private String huiftSignSecret;
private String wx_cert;
private String telApiKey;

3
hai-service/src/main/java/com/hai/config/EtcService.java
Unescape View File

@ -258,7 +258,7 @@ public class EtcService {
* @Param cardVarietyId
* @return com.alibaba.fastjson.JSONObject
*/
public static JSONObject checkNeedSignWechatWithhold(Integer productId , Integer cardVarietyId) throws Exception {
public static JSONObject checkNeedSignWechatWithhold(Integer productId , Integer cardVarietyId , String vehId) throws Exception {
// 组装数据
JSONObject map = new JSONObject();
map.put("orgCode" , CommonSysConst.getSysConfig().getNdOrgCode());
@ -266,6 +266,7 @@ public class EtcService {
JSONObject jsonObject = new JSONObject();
jsonObject.put("productId" , productId);
jsonObject.put("cardVarietyId" , cardVarietyId);
jsonObject.put("vehId" , vehId);
map.put("body" , jsonObject.toJSONString());
String sign = WxUtils.generateSignByEtc(map , CommonSysConst.getSysConfig().getNdKey());

23
hai-service/src/main/java/com/hai/dao/EtcContractOrderMapper.java
Unescape View File

@ -45,9 +45,7 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
"card_variety_name, sign_img, ",
"create_time, update_time, ",
"`status`, pay_status, ",
"sign_status, bank_sign, ",
"wechat_sign, need_sign_wechat, ",
"veh_status, op_id, ",
"sign_status, op_id, ",
"op_name, ext_1, ext_2, ",
"ext_3)",
"values (#{phone,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, ",
@ -56,9 +54,7 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
"#{cardVarietyName,jdbcType=VARCHAR}, #{signImg,jdbcType=VARCHAR}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{status,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER}, ",
"#{signStatus,jdbcType=INTEGER}, #{bankSign,jdbcType=INTEGER}, ",
"#{wechatSign,jdbcType=INTEGER}, #{needSignWechat,jdbcType=VARCHAR}, ",
"#{vehStatus,jdbcType=INTEGER}, #{opId,jdbcType=BIGINT}, ",
"#{signStatus,jdbcType=INTEGER}, #{opId,jdbcType=BIGINT}, ",
"#{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
"#{ext3,jdbcType=VARCHAR})"
})
@ -86,10 +82,6 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER),
@Result(column="sign_status", property="signStatus", jdbcType=JdbcType.INTEGER),
@Result(column="bank_sign", property="bankSign", jdbcType=JdbcType.INTEGER),
@Result(column="wechat_sign", property="wechatSign", jdbcType=JdbcType.INTEGER),
@Result(column="need_sign_wechat", property="needSignWechat", jdbcType=JdbcType.VARCHAR),
@Result(column="veh_status", property="vehStatus", jdbcType=JdbcType.INTEGER),
@Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
@Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@ -102,8 +94,7 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
"select",
"id, phone, contract_no, cust_id, veh_id, product_id, card_variety_id, product_name, ",
"card_variety_name, sign_img, create_time, update_time, `status`, pay_status, ",
"sign_status, bank_sign, wechat_sign, need_sign_wechat, veh_status, op_id, op_name, ",
"ext_1, ext_2, ext_3",
"sign_status, op_id, op_name, ext_1, ext_2, ext_3",
"from etc_contract_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -123,10 +114,6 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER),
@Result(column="sign_status", property="signStatus", jdbcType=JdbcType.INTEGER),
@Result(column="bank_sign", property="bankSign", jdbcType=JdbcType.INTEGER),
@Result(column="wechat_sign", property="wechatSign", jdbcType=JdbcType.INTEGER),
@Result(column="need_sign_wechat", property="needSignWechat", jdbcType=JdbcType.VARCHAR),
@Result(column="veh_status", property="vehStatus", jdbcType=JdbcType.INTEGER),
@Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
@Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@ -160,10 +147,6 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
"`status` = #{status,jdbcType=INTEGER},",
"pay_status = #{payStatus,jdbcType=INTEGER},",
"sign_status = #{signStatus,jdbcType=INTEGER},",
"bank_sign = #{bankSign,jdbcType=INTEGER},",
"wechat_sign = #{wechatSign,jdbcType=INTEGER},",
"need_sign_wechat = #{needSignWechat,jdbcType=VARCHAR},",
"veh_status = #{vehStatus,jdbcType=INTEGER},",
"op_id = #{opId,jdbcType=BIGINT},",
"op_name = #{opName,jdbcType=VARCHAR},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",

56
hai-service/src/main/java/com/hai/dao/EtcContractOrderSqlProvider.java
Unescape View File

@ -84,22 +84,6 @@ public class EtcContractOrderSqlProvider {
sql.VALUES("sign_status", "#{signStatus,jdbcType=INTEGER}");
}
if (record.getBankSign() != null) {
sql.VALUES("bank_sign", "#{bankSign,jdbcType=INTEGER}");
}
if (record.getWechatSign() != null) {
sql.VALUES("wechat_sign", "#{wechatSign,jdbcType=INTEGER}");
}
if (record.getNeedSignWechat() != null) {
sql.VALUES("need_sign_wechat", "#{needSignWechat,jdbcType=VARCHAR}");
}
if (record.getVehStatus() != null) {
sql.VALUES("veh_status", "#{vehStatus,jdbcType=INTEGER}");
}
if (record.getOpId() != null) {
sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}");
}
@ -144,10 +128,6 @@ public class EtcContractOrderSqlProvider {
sql.SELECT("`status`");
sql.SELECT("pay_status");
sql.SELECT("sign_status");
sql.SELECT("bank_sign");
sql.SELECT("wechat_sign");
sql.SELECT("need_sign_wechat");
sql.SELECT("veh_status");
sql.SELECT("op_id");
sql.SELECT("op_name");
sql.SELECT("ext_1");
@ -230,22 +210,6 @@ public class EtcContractOrderSqlProvider {
sql.SET("sign_status = #{record.signStatus,jdbcType=INTEGER}");
}
if (record.getBankSign() != null) {
sql.SET("bank_sign = #{record.bankSign,jdbcType=INTEGER}");
}
if (record.getWechatSign() != null) {
sql.SET("wechat_sign = #{record.wechatSign,jdbcType=INTEGER}");
}
if (record.getNeedSignWechat() != null) {
sql.SET("need_sign_wechat = #{record.needSignWechat,jdbcType=VARCHAR}");
}
if (record.getVehStatus() != null) {
sql.SET("veh_status = #{record.vehStatus,jdbcType=INTEGER}");
}
if (record.getOpId() != null) {
sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
}
@ -289,10 +253,6 @@ public class EtcContractOrderSqlProvider {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}");
sql.SET("sign_status = #{record.signStatus,jdbcType=INTEGER}");
sql.SET("bank_sign = #{record.bankSign,jdbcType=INTEGER}");
sql.SET("wechat_sign = #{record.wechatSign,jdbcType=INTEGER}");
sql.SET("need_sign_wechat = #{record.needSignWechat,jdbcType=VARCHAR}");
sql.SET("veh_status = #{record.vehStatus,jdbcType=INTEGER}");
sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@ -364,22 +324,6 @@ public class EtcContractOrderSqlProvider {
sql.SET("sign_status = #{signStatus,jdbcType=INTEGER}");
}
if (record.getBankSign() != null) {
sql.SET("bank_sign = #{bankSign,jdbcType=INTEGER}");
}
if (record.getWechatSign() != null) {
sql.SET("wechat_sign = #{wechatSign,jdbcType=INTEGER}");
}
if (record.getNeedSignWechat() != null) {
sql.SET("need_sign_wechat = #{needSignWechat,jdbcType=VARCHAR}");
}
if (record.getVehStatus() != null) {
sql.SET("veh_status = #{vehStatus,jdbcType=INTEGER}");
}
if (record.getOpId() != null) {
sql.SET("op_id = #{opId,jdbcType=BIGINT}");
}

66
hai-service/src/main/java/com/hai/entity/EtcContractOrder.java
Unescape View File

@ -84,30 +84,10 @@ public class EtcContractOrder implements Serializable {
private Integer payStatus;
/**
* 合同签约状态：1已签约， 0：未签约
* 签约状态：1已签约， 0：未签约
*/
private Integer signStatus;
/**
* 银行签约代扣状态 1已签约， 0：未签约
*/
private Integer bankSign;
/**
* 微信签约代扣状态 1已签约， 0：未签约
*/
private Integer wechatSign;
/**
* 是否需要签约微信代扣 1 需要 ， 0：不需要
*/
private String needSignWechat;
/**
* 11:待审核,12:待推送,13:已推送高速审核,15:待激活,20:已激活(已启用),21:已停用,22:已挂起,23:已挂失,28:注销审核中,29:注销中,30:已注销,31:审核拒绝,32:已取消,33:高速已拒绝
*/
private Integer vehStatus;
/**
* 操作人
*/
@ -255,38 +235,6 @@ public class EtcContractOrder implements Serializable {
this.signStatus = signStatus;
}
public Integer getBankSign() {
return bankSign;
}
public void setBankSign(Integer bankSign) {
this.bankSign = bankSign;
}
public Integer getWechatSign() {
return wechatSign;
}
public void setWechatSign(Integer wechatSign) {
this.wechatSign = wechatSign;
}
public String getNeedSignWechat() {
return needSignWechat;
}
public void setNeedSignWechat(String needSignWechat) {
this.needSignWechat = needSignWechat;
}
public Integer getVehStatus() {
return vehStatus;
}
public void setVehStatus(Integer vehStatus) {
this.vehStatus = vehStatus;
}
public Long getOpId() {
return opId;
}
@ -354,10 +302,6 @@ public class EtcContractOrder implements Serializable {
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus()))
&& (this.getSignStatus() == null ? other.getSignStatus() == null : this.getSignStatus().equals(other.getSignStatus()))
&& (this.getBankSign() == null ? other.getBankSign() == null : this.getBankSign().equals(other.getBankSign()))
&& (this.getWechatSign() == null ? other.getWechatSign() == null : this.getWechatSign().equals(other.getWechatSign()))
&& (this.getNeedSignWechat() == null ? other.getNeedSignWechat() == null : this.getNeedSignWechat().equals(other.getNeedSignWechat()))
&& (this.getVehStatus() == null ? other.getVehStatus() == null : this.getVehStatus().equals(other.getVehStatus()))
&& (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId()))
&& (this.getOpName() == null ? other.getOpName() == null : this.getOpName().equals(other.getOpName()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
@ -384,10 +328,6 @@ public class EtcContractOrder implements Serializable {
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode());
result = prime * result + ((getSignStatus() == null) ? 0 : getSignStatus().hashCode());
result = prime * result + ((getBankSign() == null) ? 0 : getBankSign().hashCode());
result = prime * result + ((getWechatSign() == null) ? 0 : getWechatSign().hashCode());
result = prime * result + ((getNeedSignWechat() == null) ? 0 : getNeedSignWechat().hashCode());
result = prime * result + ((getVehStatus() == null) ? 0 : getVehStatus().hashCode());
result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode());
result = prime * result + ((getOpName() == null) ? 0 : getOpName().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
@ -417,10 +357,6 @@ public class EtcContractOrder implements Serializable {
sb.append(", status=").append(status);
sb.append(", payStatus=").append(payStatus);
sb.append(", signStatus=").append(signStatus);
sb.append(", bankSign=").append(bankSign);
sb.append(", wechatSign=").append(wechatSign);
sb.append(", needSignWechat=").append(needSignWechat);
sb.append(", vehStatus=").append(vehStatus);
sb.append(", opId=").append(opId);
sb.append(", opName=").append(opName);
sb.append(", ext1=").append(ext1);

250
hai-service/src/main/java/com/hai/entity/EtcContractOrderExample.java
Unescape View File

@ -1095,256 +1095,6 @@ public class EtcContractOrderExample {
return (Criteria) this;
}
public Criteria andBankSignIsNull() {
addCriterion("bank_sign is null");
return (Criteria) this;
}
public Criteria andBankSignIsNotNull() {
addCriterion("bank_sign is not null");
return (Criteria) this;
}
public Criteria andBankSignEqualTo(Integer value) {
addCriterion("bank_sign =", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignNotEqualTo(Integer value) {
addCriterion("bank_sign <>", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignGreaterThan(Integer value) {
addCriterion("bank_sign >", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignGreaterThanOrEqualTo(Integer value) {
addCriterion("bank_sign >=", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignLessThan(Integer value) {
addCriterion("bank_sign <", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignLessThanOrEqualTo(Integer value) {
addCriterion("bank_sign <=", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignIn(List<Integer> values) {
addCriterion("bank_sign in", values, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignNotIn(List<Integer> values) {
addCriterion("bank_sign not in", values, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignBetween(Integer value1, Integer value2) {
addCriterion("bank_sign between", value1, value2, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignNotBetween(Integer value1, Integer value2) {
addCriterion("bank_sign not between", value1, value2, "bankSign");
return (Criteria) this;
}
public Criteria andWechatSignIsNull() {
addCriterion("wechat_sign is null");
return (Criteria) this;
}
public Criteria andWechatSignIsNotNull() {
addCriterion("wechat_sign is not null");
return (Criteria) this;
}
public Criteria andWechatSignEqualTo(Integer value) {
addCriterion("wechat_sign =", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignNotEqualTo(Integer value) {
addCriterion("wechat_sign <>", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignGreaterThan(Integer value) {
addCriterion("wechat_sign >", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignGreaterThanOrEqualTo(Integer value) {
addCriterion("wechat_sign >=", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignLessThan(Integer value) {
addCriterion("wechat_sign <", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignLessThanOrEqualTo(Integer value) {
addCriterion("wechat_sign <=", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignIn(List<Integer> values) {
addCriterion("wechat_sign in", values, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignNotIn(List<Integer> values) {
addCriterion("wechat_sign not in", values, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignBetween(Integer value1, Integer value2) {
addCriterion("wechat_sign between", value1, value2, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignNotBetween(Integer value1, Integer value2) {
addCriterion("wechat_sign not between", value1, value2, "wechatSign");
return (Criteria) this;
}
public Criteria andNeedSignWechatIsNull() {
addCriterion("need_sign_wechat is null");
return (Criteria) this;
}
public Criteria andNeedSignWechatIsNotNull() {
addCriterion("need_sign_wechat is not null");
return (Criteria) this;
}
public Criteria andNeedSignWechatEqualTo(String value) {
addCriterion("need_sign_wechat =", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatNotEqualTo(String value) {
addCriterion("need_sign_wechat <>", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatGreaterThan(String value) {
addCriterion("need_sign_wechat >", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatGreaterThanOrEqualTo(String value) {
addCriterion("need_sign_wechat >=", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatLessThan(String value) {
addCriterion("need_sign_wechat <", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatLessThanOrEqualTo(String value) {
addCriterion("need_sign_wechat <=", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatLike(String value) {
addCriterion("need_sign_wechat like", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatNotLike(String value) {
addCriterion("need_sign_wechat not like", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatIn(List<String> values) {
addCriterion("need_sign_wechat in", values, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatNotIn(List<String> values) {
addCriterion("need_sign_wechat not in", values, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatBetween(String value1, String value2) {
addCriterion("need_sign_wechat between", value1, value2, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatNotBetween(String value1, String value2) {
addCriterion("need_sign_wechat not between", value1, value2, "needSignWechat");
return (Criteria) this;
}
public Criteria andVehStatusIsNull() {
addCriterion("veh_status is null");
return (Criteria) this;
}
public Criteria andVehStatusIsNotNull() {
addCriterion("veh_status is not null");
return (Criteria) this;
}
public Criteria andVehStatusEqualTo(Integer value) {
addCriterion("veh_status =", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusNotEqualTo(Integer value) {
addCriterion("veh_status <>", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusGreaterThan(Integer value) {
addCriterion("veh_status >", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("veh_status >=", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusLessThan(Integer value) {
addCriterion("veh_status <", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusLessThanOrEqualTo(Integer value) {
addCriterion("veh_status <=", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusIn(List<Integer> values) {
addCriterion("veh_status in", values, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusNotIn(List<Integer> values) {
addCriterion("veh_status not in", values, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusBetween(Integer value1, Integer value2) {
addCriterion("veh_status between", value1, value2, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusNotBetween(Integer value1, Integer value2) {
addCriterion("veh_status not between", value1, value2, "vehStatus");
return (Criteria) this;
}
public Criteria andOpIdIsNull() {
addCriterion("op_id is null");
return (Criteria) this;

3
hai-service/src/main/java/com/hai/entity/HighCoupon.java
Unescape View File

@ -143,7 +143,8 @@ public class HighCoupon extends HighCouponModel implements Serializable {
private Integer displayArea;
/**
* 卡券来源：1.中石化 2.消费券 3.其他 4：贵州中石化 5: 预发码 6：停车券
* 卡券来源：1.中石化 2.消费券 3.其他 4：贵州中石化 5: 预发码 6：停车券 7 ：四川中石油 8：贵州中石油 9：ETC中石油 10：中油优途中石油
*
*/
private Integer couponSource;

3
hai-service/src/main/java/com/hai/etc/impl/EtcCarMsgServiceImpl.java
Unescape View File

@ -38,7 +38,7 @@ public class EtcCarMsgServiceImpl implements EtcCarMsgService {
JSONObject car = EtcService.getVehStatus(etcCarMsg);
if (car.getString("errCode").equals("0")) {
etcCarMsg.setVehStatus(car.getJSONObject("result").getInteger("vehStatus"));
etcCarMsg.setVehStatus(13);
etcCarMsg.setPayStatus(car.getJSONObject("result").getInteger("payStatus"));
etcCarMsg.setSignStatus(car.getJSONObject("result").getInteger("signStatus"));
@ -53,7 +53,6 @@ public class EtcCarMsgServiceImpl implements EtcCarMsgService {
contractOrder.setCardVarietyName(EtcVarietyEnum.getNameByType(etcCarMsg.getCardVarietyId()));
contractOrder.setVehId(etcCarMsg.getVehId());
contractOrder.setPayStatus(1);
contractOrder.setVehStatus(etcCarMsg.getVehStatus());
contractOrder.setSignStatus(0);
contractOrder.setOpId(etcCarMsg.getUserId());
contractOrder.setOpName(etcCarMsg.getUserName());

6
hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
Unescape View File

@ -1335,12 +1335,14 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
}
@Override
public HighChildOrder etcUser(HighOrder order, CreateOrderChildModel createOrderChildModel) throws Exception {
public HighChildOrder etcUser(HighOrder order, CreateOrderChildModel createOrderChildModel) {
HighChildOrder childOrder = new HighChildOrder();
childOrder.setOrderNo(order.getOrderNo());
childOrder.setMemId(order.getMemId());
childOrder.setMemName(order.getMemName());
childOrder.setMemPhone(order.getMemPhone());
childOrder.setSkuId(createOrderChildModel.getSkuId());
childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo());
childOrder.setGoodsType(OrderChildGoodsType.TYPE20.getNumber());
childOrder.setGoodsId(createOrderChildModel.getGoodsId());
@ -1356,7 +1358,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
childOrder.setTotalDeductionPrice(childOrder.getTotalPrice().subtract(childOrder.getTotalActualPrice()));
childOrder.setPraiseStatus(0);
childOrder.setCreateTime(new Date());
return childOrder;
}
}

5
hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
Unescape View File

@ -816,11 +816,8 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
carMsg.setPayStatus(2);
etcCarMsgService.updateEtcCar(carMsg);
// 查询赠送优惠券
SecConfig secConfig = secConfigService.findByCodeType("GIVE_DISCOUNT_PACKAGE");
// 赠送优惠券
highDiscountPackageService.giveAway(Long.parseLong(secConfig.getCodeValue()) , order.getMemPhone() , 2 , order.getMemId().toString());
highDiscountPackageService.giveAway(order.getHighChildOrderList().get(0).getSkuId() , order.getMemPhone() , 2 , order.getMemId().toString());
}

18
hai-service/src/main/java/com/hai/pay/channel/huift/TradeService.java
Unescape View File

@ -10,7 +10,6 @@ import com.hai.entity.HighOrder;
import com.hai.entity.HighOrderRefund;
import com.hai.enum_type.OrderStatusEnum;
import com.hai.order.type.OrderPayType;
import com.hai.order.type.OrderProductType;
import com.hai.pay.channel.huift.config.HuiftConfig;
import com.hai.service.HighOrderService;
import org.springframework.stereotype.Component;
@ -46,22 +45,7 @@ public class TradeService {
param.put("callbackUrl", CommonSysConst.getSysConfig().getHsgDomainName() + "/order/payNotify/huiftPay");
// param.put("remark", ""); // 备注
// param.put("outAppId", "");
if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE12.getNumber())) {
param.put("outRedirectPath", CommonSysConst.getSysConfig().getHsgDomainName()+"/hsgH5?accountId=0000016&key=&code=/physical-merchants/classify/order/orderDetail?id=" + order.getOrderNo());
} else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE5.getNumber())) {
param.put("outRedirectPath", CommonSysConst.getSysConfig().getHsgDomainName()+"/hsgH5?accountId=0000016&key=&code=/pages/pay/success/success?id=" + order.getOrderNo());
} else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE1.getNumber()) || order.getProductType().equals(OrderProductType.PRODUCT_TYPE2.getNumber())) {
param.put("outRedirectPath", CommonSysConst.getSysConfig().getHsgDomainName()+"/hsgH5?accountId=0000016&key=&code=/gianzhu-KFC/order-details/order-details?id=" + order.getOrderNo());
} else {
param.put("outRedirectPath", CommonSysConst.getSysConfig().getHsgDomainName()+"/hsgH5?accountId=0000016&key=&code=/pages/user/order_details/order_details?id=" + order.getOrderNo());
}
// param.put("outRedirectPath", "");
param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, HuiftConfig.signSecret).getBytes()).toLowerCase());
JSONObject response = HttpsUtils.doPost(HuiftConfig.reqUrl + "/hfq/v1/thirdPay/thirdPreOrder", JSONObject.toJSONString(param));
if (response.getString("status").equals("ok")) {

8
hai-service/src/main/java/com/hai/pay/channel/huift/config/HuiftConfig.java
Unescape View File

@ -1,7 +1,5 @@
package com.hai.pay.channel.huift.config;
import com.hai.config.CommonSysConfig;
import com.hai.config.CommonSysConst;
import org.apache.commons.lang3.StringUtils;
import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
@ -17,9 +15,9 @@ import java.util.Set;
**/
public class HuiftConfig {
public final static String reqUrl = CommonSysConst.getSysConfig().getHuiftReqUrl();
public final static String shopcode = CommonSysConst.getSysConfig().getHuiftShopCode();
public final static String signSecret = CommonSysConst.getSysConfig().getHuiftSignSecret();
public final static String reqUrl = "https://linktest.huift.com.cn";
public final static String shopcode = "50041b27-f985-dcb0-1cc0-f106b09bf1fe";
public final static String signSecret = "DB4D8069A9AC6DDF9D75667EE5CF182A";
/**
* 参数排序

2
hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
Unescape View File

@ -791,7 +791,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
object.put("orderNo" , childOrder.getOrderNo());
JSONObject jsonObject = RechargeConfig.checkOrderByJn(object);
childOrder.setExt3("畅停查询"+ jsonObject);
childOrder.setExt3("简牛查询"+ jsonObject);
if (jsonObject.getJSONObject("data") != null) {
JSONObject objectData= jsonObject.getJSONObject("data");
// // 10充值中 20充值完成 -10 充值失败

6
hai-service/src/main/resources/dev/commonConfig.properties
Unescape View File

@ -57,12 +57,6 @@ huiliantongSinopecDistributorId=aNId4A3X
huiliantongDistributorId=1JnL8YMV
huiliantongSinopecUrl=fuelCoupons
huiftReqUrl=https://gzyhmp.huift.com.cn
huiftShopCode=20240653-59c4-4181-9157-17fd4b95c3fc
huiftSignSecret=19C17F9E19B8DDDDF2FD2EE4EA9F6C61
HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json
HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE
HuiLianTongUnionCardSignCode=F8E91A3C

3
hai-service/src/main/resources/prod/commonConfig.properties
Unescape View File

@ -101,9 +101,6 @@ HgApiKey=3fd74e7c16b04681a0f481c5bc0a96d3
HgMemberId=1622808562621276161
HgPostUrl=http://113.250.49.100:8088/recharge/
huiftReqUrl=https://gzyhmp.huift.com.cn
huiftShopCode=20240653-59c4-4181-9157-17fd4b95c3fc
huiftSignSecret=19C17F9E19B8DDDDF2FD2EE4EA9F6C61
#CY
CyApiKey=cyMYLABWa2H2u

Write Preview
Loading…
Cancel
Save