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

dev
袁野 3 months ago
parent 8533a66b0c
commit 1330a6be40
  1. 5
      bweb/src/main/java/com/bweb/config/ConfigListener.java
  2. 85
      bweb/src/main/java/com/bweb/controller/TestController.java
  3. 3
      schedule/src/main/java/com/ScheduleApplication.java
  4. 2
      schedule/src/main/java/com/schedule/config/AuthConfig.java
  5. 2
      schedule/src/main/java/com/schedule/config/ConfigListener.java
  6. 2
      schedule/src/main/java/com/schedule/config/CorsConfig.java
  7. 2
      schedule/src/main/java/com/schedule/config/MultipartConfig.java
  8. 2
      schedule/src/main/java/com/schedule/config/RedisConfig.java
  9. 2
      schedule/src/main/java/com/schedule/config/SwaggerConfig.java
  10. 2
      schedule/src/main/java/com/schedule/config/SysConfig.java
  11. 2
      schedule/src/main/java/com/schedule/config/SysConst.java
  12. 10
      schedule/src/main/java/com/schedule/controller/CouponSchedule.java
  13. 36
      schedule/src/main/java/com/schedule/controller/JdGoodsSchedule.java
  14. 6
      schedule/src/main/java/com/schedule/controller/OrderGoodsSchedule.java
  15. 3
      service/src/main/java/com/hfkj/common/security/UserCenter.java
  16. 8
      service/src/main/java/com/hfkj/jd/Impl/JdServiceImpl.java
  17. 8
      service/src/main/java/com/hfkj/jd/JdPostService.java
  18. 2
      service/src/main/java/com/hfkj/jd/JdService.java
  19. 29
      service/src/main/java/com/hfkj/service/order/impl/BsOrderRefundServiceImpl.java

@ -1,7 +1,6 @@
package com.bweb.config;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.annotation.WebListener;
@ -9,7 +8,7 @@ import javax.servlet.annotation.WebListener;
@WebListener
public class ConfigListener implements ServletContextListener {
@Autowired
@Resource
private SysConfig sysConfig;
@Override

@ -200,7 +200,7 @@ public class TestController {
// 工会卡支付
JSONObject consumption = HuiLianTongUnionCardService.consumption(orderNo, cardNo, payRealPrice, "HiSen_phg_goods", "11101608", "", "241001130753599939订单扣款");
JSONObject consumption = HuiLianTongUnionCardService.consumption(orderNo, cardNo, payRealPrice, "HiSen_phg_goods", "11101667", "", "250122151032399686订单扣款");
if (!consumption.getString("respCode").equals("0000")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumption.getString("respMessage"));
}
@ -240,6 +240,7 @@ public class TestController {
@ResponseBody
@ApiOperation(value = "更新京东物流信息")
public ResponseData orderGoodsJd() {
try {
List<BsOrderGoods> orderGoodsList = orderGoodsService.getListByJd();
@ -397,13 +398,9 @@ public class TestController {
}
@RequestMapping(value="/getGoodsJd",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "更新商品")
@ApiOperation(value = "更新京东新增商品")
public ResponseData getGoodsJd() {
try {
jdService.getGoodsJd();
@ -415,6 +412,20 @@ public class TestController {
}
}
@RequestMapping(value="/updateGoodsMsg",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "更新商品")
public ResponseData updateGoodsMsg(@RequestParam(value = "skuId", required = false) Long skuId) {
try {
jdService.updateGoodsMsg(skuId);
return ResponseMsgUtil.success("");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/confirmOrder",method = RequestMethod.GET)
@ResponseBody
@ -515,19 +526,48 @@ public class TestController {
}
}
@RequestMapping(value="/meiTuanRefund",method = RequestMethod.GET)
@RequestMapping(value="/resolveResponse",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "meiTuanRefund")
public ResponseData meiTuanRefund() {
@ApiOperation(value = "resolveResponse")
public ResponseData resolveResponse(@RequestParam(value = "data", required = false) String data) {
try {
JSONObject consumptionResult = HuiLianTongUnionCardService.resolveResponse(data);
// orderRefundService.meiTuanRefund(
// "R"+DateUtil.date2String(new Date(), "yyMMddHHmmss") + RandomUtils.number(3, false) ,
// "1895338934767706172" ,
// new BigDecimal("56.14") ,
// "美团退款"
// );
return ResponseMsgUtil.success(consumptionResult);
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/cancelOrder",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "cancelOrder")
public ResponseData cancelOrder(@RequestParam(value = "thirdOrderNo", required = false) String thirdOrderNo,
@RequestParam(value = "childOrderNo", required = false) String childOrderNo) {
try {
JdPostService.cancelOrder(jdService.getToken(), Long.valueOf(thirdOrderNo), childOrderNo , "取消订单!");
return ResponseMsgUtil.success("取消");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
orderRefundService.meiTuanRefund(
"R"+DateUtil.date2String(new Date(), "yyMMddHHmmss") + RandomUtils.number(3, false) ,
"1895338934767706172" ,
new BigDecimal("56.14") ,
"美团退款"
);
return ResponseMsgUtil.success("成功");
@RequestMapping(value="/getOrderCancelProcessDetail",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "getOrderCancelProcessDetail")
public ResponseData getOrderCancelProcessDetail(@RequestParam(value = "thirdOrderNo", required = false) String thirdOrderNo) {
try {
return ResponseMsgUtil.success(JdPostService.getOrderCancelProcessDetail(jdService.getToken(), Long.valueOf(thirdOrderNo)));
} catch (Exception e) {
log.error("error!",e);
@ -535,5 +575,18 @@ public class TestController {
}
}
@RequestMapping(value="/deleteMsg",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "deleteMsg")
public ResponseData deleteMsg() {
try {
jdService.deleteMsg();
return ResponseMsgUtil.success("11");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -1,4 +1,4 @@
package com.hfkj;
package com;
import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation;
import com.alicp.jetcache.anno.config.EnableMethodCache;
@ -12,7 +12,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication
// @ComponentScan
@EnableTransactionManagement
@EnableScheduling
@EnableMethodCache(basePackages = "com.hfkj")

@ -1,4 +1,4 @@
package com.cweb.config;
package com.schedule.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;

@ -1,4 +1,4 @@
package com.hfkj.config;
package com.schedule.config;
import javax.annotation.Resource;
import javax.servlet.ServletContextEvent;

@ -1,4 +1,4 @@
package com.hfkj.config;
package com.schedule.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@ -1,4 +1,4 @@
package com.hfkj.config;
package com.schedule.config;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.context.annotation.Bean;

@ -1,4 +1,4 @@
package com.hfkj.config;
package com.schedule.config;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;

@ -1,4 +1,4 @@
package com.hfkj.config;
package com.schedule.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@ -1,4 +1,4 @@
package com.hfkj.config;
package com.schedule.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.PropertySource;

@ -1,4 +1,4 @@
package com.hfkj.config;
package com.schedule.config;
public class SysConst {

@ -1,4 +1,4 @@
package com.hfkj.schedule;
package com.schedule.controller;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.entity.BsOrderCoupon;
@ -6,11 +6,8 @@ import com.hfkj.entity.BsOrderCouponNo;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.coupon.channel.HuiLianTongCouponService;
import com.hfkj.service.coupon.channel.PetroConfig;
import com.hfkj.service.coupon.channel.YouTuCouponService;
import com.hfkj.service.hlt.HuiLianTongUnionCardService;
import com.hfkj.service.order.BsOrderChildService;
import com.hfkj.service.order.BsOrderService;
import com.hfkj.sysenum.GoodsVpdSourceEnum;
import com.hfkj.sysenum.order.OrderCouponNoStatusEnum;
import org.slf4j.Logger;
@ -34,10 +31,7 @@ public class CouponSchedule {
private static Logger log = LoggerFactory.getLogger(CouponSchedule.class);
@Resource
private BsOrderChildService orderChildService;
@Resource
private BsOrderService orderService;
@Resource
BsOrderCouponService orderCouponService;
@Resource

@ -1,23 +1,14 @@
package com.hfkj.schedule;
package com.schedule.controller;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.utils.DateUtil;
import com.hfkj.entity.*;
import com.hfkj.jd.JdService;
import com.hfkj.model.goods.JdGoodsModel;
import com.hfkj.service.cms.CmsContentService;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.coupon.channel.HuiLianTongCouponService;
import com.hfkj.service.coupon.channel.YouTuCouponService;
import com.hfkj.service.goods.BsOrderGoodsService;
import com.hfkj.service.goods.GoodsMsgService;
import com.hfkj.service.hlt.HuiLianTongUnionCardService;
import com.hfkj.service.order.BsOrderChildService;
import com.hfkj.service.order.BsOrderService;
import com.hfkj.sysenum.GoodsVpdSourceEnum;
import com.hfkj.sysenum.order.OrderCouponNoStatusEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.Scheduled;
@ -35,7 +26,7 @@ public class JdGoodsSchedule {
private static Logger log = LoggerFactory.getLogger(JdGoodsSchedule.class);
@Resource
@Autowired
private JdService jdService;
@Resource
@ -43,10 +34,12 @@ public class JdGoodsSchedule {
@Resource
private CmsContentService cmsContentService;
@Resource
private BsOrderGoodsService orderGoodsService;
//每10分钟执行一次
@Scheduled(cron = "0 0/10 * * * ?")
public void etcCarMsg() {
public void deleteMsg() {
try {
jdService.deleteMsg();
@ -113,4 +106,19 @@ public class JdGoodsSchedule {
cmsContentService.cacheDelete("HOME_DATAWXAPPLETS");
}
@Scheduled(cron = "0 0/30 * * * ?")
public void orderGoodsLogistics() {
try {
List<BsOrderGoods> orderGoodsList = orderGoodsService.getListByJd();
for (BsOrderGoods goods : orderGoodsList) {
jdService.updateDeliveryInfo(goods);
}
} catch (Exception e) {
log.error("HighUserController --> findByUserId() error!", e);
}
}
}

@ -1,16 +1,12 @@
package com.hfkj.schedule;
package com.schedule.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.DateUtil;
import com.hfkj.entity.*;
import com.hfkj.jd.JdService;
import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.goods.BsOrderGoodsService;
import com.hfkj.service.goods.BsOrderStarbucksService;
import com.hfkj.service.goods.GoodsUserAddressService;
import com.hfkj.service.goods.impl.BsOrderMeiTuanServiceImpl;
import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
import com.hfkj.service.order.BsOrderChildService;

@ -4,7 +4,6 @@ import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.RedisUtil;
import com.hfkj.model.SecUserSessionObject;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -13,9 +12,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@Component
public class UserCenter {

@ -469,6 +469,11 @@ public class JdServiceImpl implements JdService {
}
@Override
public void updateGoodsMsg(Long skuId) throws Exception {
updateGoodsMsg(getToken() , skuId);
}
@Override
public void deleteMsg() throws Exception {
@ -540,6 +545,7 @@ public class JdServiceImpl implements JdService {
// 设置原价
specs.setOriginalPrice(price.getMarketPrice());
specs.setThirdPrice(price.getJdPrice());
specs.setName(goodsMsg.getTitle());
specs.setExt3(price.getSalePrice().toString());
// 设置展示图片
goodsSpecsService.update(specs);
@ -586,7 +592,7 @@ public class JdServiceImpl implements JdService {
// 更新商品信息
goodsMsgService.update(goodsMsg);
updatePrice(goodsMsg);
}

@ -378,6 +378,14 @@ public class JdPostService {
client.execute(request);
}
// 查询取消订单详情
public static VopOrderQueryOrderOpenProviderGetOrderCancelProcessDetailResponse getOrderCancelProcessDetail(String token , Long jdOrderId ) throws Exception {
JdClient client=new DefaultJdClient(SERVER_URL,token,CommonSysConst.getSysConfig().getJDAppKey(),CommonSysConst.getSysConfig().getJDAppSecret());
VopOrderQueryOrderOpenProviderGetOrderCancelProcessDetailRequest request=new VopOrderQueryOrderOpenProviderGetOrderCancelProcessDetailRequest();
request.setJdOrderId(jdOrderId);
return client.execute(request);
}
// 确定订单
public static VopOrderConfirmOrderResponse confirmOrder(String token , Long jdOrderId , String thirdOrderId , String remarks) throws Exception {
JdClient client=new DefaultJdClient(SERVER_URL,token,CommonSysConst.getSysConfig().getJDAppKey(),CommonSysConst.getSysConfig().getJDAppSecret());

@ -61,6 +61,8 @@ public interface JdService {
*/
void cancelOrder(String childNo);
void updateGoodsMsg(Long skuId) throws Exception;
/**
* @MethodName deleteMsg
* @Description: 消费消息

@ -20,6 +20,7 @@ import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.discount.CouponDiscountUserRelService;
import com.hfkj.service.goods.BsOrderMeiTuanService;
import com.hfkj.service.goods.GoodsVpdService;
import com.hfkj.service.hlt.BsHltCardRecordService;
import com.hfkj.service.hlt.HltCardRefundService;
import com.hfkj.service.hlt.HuiLianTongUnionCardService;
import com.hfkj.service.order.BsOrderChildService;
@ -81,6 +82,8 @@ public class BsOrderRefundServiceImpl implements BsOrderRefundService {
private BsOrderCouponNoService orderCouponNoService;
@Resource
private CouponDiscountUserRelService discountUserRelService;
@Resource
private BsHltCardRecordService bsHltCardRecordService;
@Override
public void editData(BsOrderRefund data) {
data.setUpdateTime(new Date());
@ -184,10 +187,10 @@ public class BsOrderRefundServiceImpl implements BsOrderRefundService {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的交易订单");
}
// 创建退款订单
BsOrderRefund orderRefund = new BsOrderRefund();
orderRefund.setMerId(orderChild.getMerId());
orderRefund.setOrderNo(orderChild.getOrderNo());
orderRefund.setOrderChildNo(orderChild.getChildOrderNo());
orderRefund.setUserId(order.getUserId());
orderRefund.setUserPhone(order.getUserPhone());
@ -196,10 +199,24 @@ public class BsOrderRefundServiceImpl implements BsOrderRefundService {
orderRefund.setRefundPayChannel(order.getPayChannel());
orderRefund.setReufndPayType(order.getPayType());
// 查询是否存在已经退款过记录
BsHltCardRecord hltCardRecord = bsHltCardRecordService.getNewPayOrderNo(orderChild.getOrderNo());
if (hltCardRecord != null) {
orderRefund.setOrderNo(hltCardRecord.getPayOrderNo());
} else {
orderRefund.setOrderNo(orderChild.getOrderNo());
}
if (goodsVpdSource(orderChild)) {
// 已经使用金额
BigDecimal useAmount = getRefundAmount(orderChild);
BigDecimal useAmount;
if (orderChild.getExt3() != null && orderChild.getExt3().equals("老数据退款")) {
// 已经使用金额
useAmount = new BigDecimal(orderChild.getExt2());
} else {
useAmount = getRefundAmount(orderChild);
}
if (useAmount == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败!");
}
@ -214,7 +231,9 @@ public class BsOrderRefundServiceImpl implements BsOrderRefundService {
// 部分退款
// 计算单价
BigDecimal unitPrice = orderChild.getProductActualPrice().subtract(useAmount);
orderRefund.setRefundPrice(unitPrice.multiply(new BigDecimal(productCount.toString())));
BigDecimal unitPriceIntegral = unitPrice.divide(orderChild.getProductActualPrice() , 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(orderChild.getSurplusRefundIntegral().toString()));
orderRefund.setRefundPrice(unitPrice);
orderRefund.setRefundIntegral(unitPriceIntegral.multiply(new BigDecimal("100")).longValue());
}
if (orderChild.getProductActualPrice().compareTo(useAmount) < 0) {
@ -241,8 +260,6 @@ public class BsOrderRefundServiceImpl implements BsOrderRefundService {
}
if (orderRefund.getRefundIntegral() > 0L) {
Map<String,Object> opUser = new HashMap<>();
opUser.put("opUserType", orderRefund.getOpUserType());

Loading…
Cancel
Save