diff --git a/hai-schedule/src/main/java/com/hai/schedule/HighOrderSchedule.java b/hai-schedule/src/main/java/com/hai/schedule/HighOrderSchedule.java index 622b2dfb..dc513c08 100644 --- a/hai-schedule/src/main/java/com/hai/schedule/HighOrderSchedule.java +++ b/hai-schedule/src/main/java/com/hai/schedule/HighOrderSchedule.java @@ -95,16 +95,16 @@ public class HighOrderSchedule { @Scheduled(cron="0 0/1 * * * ?") //每1分钟执行一次 public void initRechargeOrder() { Map map = new HashMap<>(); - map.put("status" , String.valueOf(102)); + map.put("payStatus" , String.valueOf(102)); map.put("rechargeStatus" , String.valueOf(204)); List orderList = outRechargeOrderService.getListRechargeOrder(map); - if (orderList != null && orderList.size() > 0) { + System.out.println("订单数量------------------------------------------------------------------------------" + orderList.size()); + if (orderList.size() > 0) { for (OutRechargeOrder order : orderList) { try { // 查询充值子订单 Map childOrderMap = new HashMap<>(); - childOrderMap.put("parent_order_id" , order.getId()); childOrderMap.put("status" , 102); diff --git a/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java index 72e407f7..a3e2f0f5 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java @@ -200,7 +200,7 @@ public class HltUnionCardVipServiceImpl implements HltUnionCardVipService { } else { if (equityLevel == 1) { HuiLianTongUnionCardConfig.submitSms(phone , "“E信通会员专属”3张4元话费券、2张96折加油券已到账,打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用,到账之日起1月内(30天)有效。"); - } else { + } else if (equityLevel == 2){ HuiLianTongUnionCardConfig.submitSms(phone , "“工会卡用户专属”2元话费券、2张96折加油券已到账,打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用,到账之日起1月内(30天)有效。"); } } diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java index 6766d5fa..30846ad2 100644 --- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java @@ -587,6 +587,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { public void rechargeOrderToRefund(Long orderId) throws Exception { OutRechargeOrder order = outRechargeOrderService.findByOrderId(orderId); + System.out.println("发起退款------------------------------------------------------------------------------" + orderId); // 101.待支付 102.已支付 100.已完成 104.已取消 105.已退款 if (order.getPayStatus() != 102) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法退款,订单不处于已支付状态"); @@ -596,8 +597,9 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { if (order.getRechargeStatus() == 201) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法退款,订单处于充值中状态"); } + // 退还积分 - if (order.getIntegralNum() != null) { + if (order.getIntegralNum().compareTo(new BigDecimal(0)) > 0) { highUserService.goldHandle(order.getUserId(), order.getIntegralNum().intValue(), 1, 3, order.getId()); if (order.getPayRealPrice().compareTo(new BigDecimal(0)) == 0) { order.setPayStatus(105); @@ -788,8 +790,8 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { object.put("amount", outRechargePrice.getRechargePrice()); object.put("mobile", outRechargeOrder.getRechargeContent()); object.put("notifyUrl", CommonSysConst.getSysConfig().getJjNotifyUrl()); - System.out.println("尖椒请求回调地址---------------------" + CommonSysConst.getSysConfig().getJjNotifyUrl()); - if (outRechargePrice.getRechargeType() == 1) { + System.out.println("outRechargeOrder-----------------------------------------------------------------------------------------------------------------------------------------------------" + outRechargePrice.getRechargeType()); + if (outRechargeOrder.getRechargeType() == 1) { object.put("is_fast", 1); } JSONObject returnObject = RechargeConfig.rechargeOrderByJj(object);