定时任务修改文件包与service 冲突

dev
袁野 3 weeks ago
parent eb11df9f7c
commit e76b48a450
  1. 67
      order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
  2. 17
      service/src/main/java/com/hfkj/config/MessageConfig.java
  3. 51
      service/src/main/java/com/hfkj/sysenum/jd/JdCancelProcessCodeEnum.java
  4. 2
      user/src/main/java/com/user/controller/SmsController.java

@ -14,6 +14,7 @@ import com.hfkj.common.utils.DateUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.*;
import com.hfkj.jd.JdPostService;
import com.hfkj.jd.JdService;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
@ -25,7 +26,9 @@ import com.hfkj.service.order.BsOrderAfterSalesApplyService;
import com.hfkj.service.order.BsOrderService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
import com.hfkj.sysenum.fileRecords.FileRecordsEnum;
import com.hfkj.sysenum.jd.JdCancelProcessCodeEnum;
import com.hfkj.sysenum.order.*;
import com.jd.open.api.sdk.response.vopdd.VopOrderQueryOrderOpenProviderGetOrderCancelProcessDetailResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.beanutils.BeanUtils;
@ -460,6 +463,70 @@ public class BsOrderGoodsController {
}
}
@RequestMapping(value="/interceptOrderGoods",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "拦截京东实物订单")
public ResponseData interceptOrderGoods(@RequestParam(value = "childOrderNo" , required = true) String childOrderNo) {
try {
BsOrderGoods orderGoods = orderGoodsService.findGoodsOrderByChild(childOrderNo);
if (orderGoods == null) {
throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "未找到相信息");
}
if (orderGoods.getStatus() != 2 && orderGoods.getThirdOrderNo() == null) {
throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "当前订单不可拦截!");
}
JdPostService.cancelOrder(jdService.getToken(), Long.valueOf(orderGoods.getThirdOrderNo()), childOrderNo , "取消订单!");
return ResponseMsgUtil.success("提交拦截!");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/getInterceptOrderGoods",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询拦截京东实物订单结果")
public ResponseData getInterceptOrderGoods(@RequestParam(value = "childOrderNo" , required = true) String childOrderNo) {
try {
BsOrderGoods orderGoods = orderGoodsService.findGoodsOrderByChild(childOrderNo);
if (orderGoods == null && orderGoods.getThirdOrderNo() != null) {
throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "未找到相信息");
}
if (orderGoods.getStatus() != 2 && orderGoods.getThirdOrderNo() == null) {
throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "当前订单不支持查询!");
}
VopOrderQueryOrderOpenProviderGetOrderCancelProcessDetailResponse response = JdPostService.getOrderCancelProcessDetail(jdService.getToken(), Long.valueOf(orderGoods.getThirdOrderNo()));
if (response == null || !response.getOpenRpcResult().getSuccess() || !response.getOpenRpcResult().getResultCode().equals("0000")) {
throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "查询失败!");
}
return ResponseMsgUtil.success(JdCancelProcessCodeEnum.getData(response.getOpenRpcResult().getResult().getCancelProcessCode()));
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/goodsOrderCount",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "待收货数量")

@ -32,25 +32,8 @@ import java.util.*;
public class MessageConfig {
// 华为短信模版ID
// 嗨森逛绑定工会卡
public final static String HWMSG_ID1 = "SMS_22041400010";
// 嗨森逛积分支付密码重置
public final static String HWMSG_ID2 = "SMS_22041400009";
// 嗨森逛注册
public final static String HWMSG_ID3 = "SMS_22041400008";
// 嗨森逛公司账户充值验证码
public final static String HWMSG_ID4 = "SMS_22041400005";
// 嗨森逛账号登录
public final static String HWMSG_ID5 = "SMS_22050700002";
// 嗨森逛账号登录支付密码修改
public final static String HWMSG_ID6 = "SMS_22072500001";
public final static String HWMSG_ID7 = "SMS_24051700003";
private static final String[] HEX_DIGITS = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"};
private static Logger log = LoggerFactory.getLogger(MessageConfig.class);
/**
* 设置不验证主机

@ -0,0 +1,51 @@
package com.hfkj.sysenum.jd;
import com.hfkj.sysenum.order.OrderAfterSalesApplyStatusEnum;
import lombok.Getter;
import java.util.Objects;
/**
* @ClassName JdCancelProcessCodeEnum
* @Author Sum1Dream
* @Description 京东取消订单状态
* @Date 2025/3/14 上午10:33
**/
@Getter
public enum JdCancelProcessCodeEnum {
/**
* 提交申请
*/
status1(1, "提交申请"),
/**
* 取消处理中
*/
status2(2, "取消处理中"),
/**
* 取消成功
*/
status3(3, "取消成功"),
/**
* 取消失败
*/
status4(4, "取消失败"),
;
private int code;
private String name;
JdCancelProcessCodeEnum(int code, String name) {
this.code = code;
this.name = name;
}
public static JdCancelProcessCodeEnum getData(Integer type) {
for (JdCancelProcessCodeEnum ele : values()) {
if(Objects.equals(type,ele.getCode())) return ele;
}
return null;
}
}

@ -1 +1 @@
package com.user.controller; import com.alibaba.fastjson.JSONObject; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; import com.hfkj.common.utils.MemberValidateUtil; import com.hfkj.common.utils.RedisUtil; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.config.MessageConfig; import com.hfkj.model.ResponseData; import com.hfkj.service.user.BsUserService; 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 java.util.Random; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/sms") @Api(value = "短信服务") public class SmsController { private static Logger log = LoggerFactory.getLogger(SmsController.class); @Resource private RedisUtil redisUtil; @RequestMapping(value = "/sendLoginSMSCode", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "获取登录验证码") public ResponseData sendLoginSMSCode(@RequestBody JSONObject body) { try { if (body == null || StringUtils.isBlank(body.getString("phone"))) { log.error("LoginController --> phone() error!", "请求参数校验失败"); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } String phone = body.getString("phone"); // 校验手机号格式 if (MemberValidateUtil.validatePhone(phone) == false) { log.error("LoginController --> phone() error!", "请输入正确的手机号"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入正确的手机号"); } // 生成随机6位验证码 String smsCode = String.valueOf(new Random().nextInt(899999) + 100000); MessageConfig.req(phone,smsCode, MessageConfig.HWMSG_ID5); // 验证码缓存5分钟 redisUtil.set("SMS_CODE:"+phone, smsCode, 60*5); return ResponseMsgUtil.success("短信发送成功"); } catch (Exception e) { log.error("SMSController --> getLoginSMSCode() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/sendBindCardSMSCode", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "获取绑定卡片验证码") public ResponseData sendBindCardSMSCode(@RequestBody JSONObject body) { try { if (body == null || StringUtils.isBlank(body.getString("phone"))) { log.error("LoginController --> phone() error!", "请求参数校验失败"); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } String phone = body.getString("phone"); // 校验手机号格式 if (MemberValidateUtil.validatePhone(phone) == false) { log.error("LoginController --> phone() error!", "请输入正确的手机号"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入正确的手机号"); } // 生成随机6位验证码 String smsCode = String.valueOf(new Random().nextInt(899999) + 100000); MessageConfig.req(phone,smsCode, MessageConfig.HWMSG_ID7); // 验证码缓存5分钟 redisUtil.set("SMS_CODE:"+phone, smsCode, 60*5); return ResponseMsgUtil.success("短信发送成功"); } catch (Exception e) { log.error("SMSController --> getLoginSMSCode() error!", e); return ResponseMsgUtil.exception(e); } } }
package com.user.controller; import com.alibaba.fastjson.JSONObject; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; import com.hfkj.common.utils.MemberValidateUtil; import com.hfkj.common.utils.RedisUtil; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.config.MessageConfig; import com.hfkj.model.ResponseData; import com.hfkj.service.user.BsUserService; 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 java.util.Random; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/sms") @Api(value = "短信服务") public class SmsController { private static Logger log = LoggerFactory.getLogger(SmsController.class); @Resource private RedisUtil redisUtil; @RequestMapping(value = "/sendLoginSMSCode", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "获取登录验证码") public ResponseData sendLoginSMSCode(@RequestBody JSONObject body) { try { if (body == null || StringUtils.isBlank(body.getString("phone"))) { log.error("LoginController --> phone() error!", "请求参数校验失败"); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } String phone = body.getString("phone"); // 校验手机号格式 if (MemberValidateUtil.validatePhone(phone) == false) { log.error("LoginController --> phone() error!", "请输入正确的手机号"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入正确的手机号"); } // 生成随机6位验证码 String smsCode = String.valueOf(new Random().nextInt(899999) + 100000); MessageConfig.req(phone,smsCode, MessageConfig.HWMSG_ID7); // 验证码缓存5分钟 redisUtil.set("SMS_CODE:"+phone, smsCode, 60*5); return ResponseMsgUtil.success("短信发送成功"); } catch (Exception e) { log.error("SMSController --> getLoginSMSCode() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/sendBindCardSMSCode", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "获取绑定卡片验证码") public ResponseData sendBindCardSMSCode(@RequestBody JSONObject body) { try { if (body == null || StringUtils.isBlank(body.getString("phone"))) { log.error("LoginController --> phone() error!", "请求参数校验失败"); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } String phone = body.getString("phone"); // 校验手机号格式 if (MemberValidateUtil.validatePhone(phone) == false) { log.error("LoginController --> phone() error!", "请输入正确的手机号"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入正确的手机号"); } // 生成随机6位验证码 String smsCode = String.valueOf(new Random().nextInt(899999) + 100000); MessageConfig.req(phone,smsCode, MessageConfig.HWMSG_ID7); // 验证码缓存5分钟 redisUtil.set("SMS_CODE:"+phone, smsCode, 60*5); return ResponseMsgUtil.success("短信发送成功"); } catch (Exception e) { log.error("SMSController --> getLoginSMSCode() error!", e); return ResponseMsgUtil.exception(e); } } }
Loading…
Cancel
Save