|
|
|
@ -41,6 +41,7 @@ import java.math.BigDecimal; |
|
|
|
|
import java.math.RoundingMode; |
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
|
|
|
|
|
@Service("outRechargeOrderService") |
|
|
|
|
public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { |
|
|
|
@ -141,7 +142,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { |
|
|
|
|
DateUtil.format(MapUtils.getString(map, "createTimeE"), "yyyy-MM-dd HH:mm:ss")); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
example.setOrderByClause("create_timed desc"); |
|
|
|
|
example.setOrderByClause("create_timed ASC"); |
|
|
|
|
return outRechargeOrderMapper.selectByExample(example); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -756,8 +757,8 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { |
|
|
|
|
// 查询充值子订单
|
|
|
|
|
Map<String, Object> childOrderMap103 = new HashMap<>(); |
|
|
|
|
|
|
|
|
|
childOrderMap.put("parent_order_id", outRechargeOrder.getId()); |
|
|
|
|
childOrderMap.put("status", 103); |
|
|
|
|
childOrderMap103.put("parent_order_id", outRechargeOrder.getId()); |
|
|
|
|
childOrderMap103.put("status", 103); |
|
|
|
|
|
|
|
|
|
List<OutRechargeChildOrder> childOrderList103 = outRechargeChildOrderService.getListRechargeChildOrder(childOrderMap103); |
|
|
|
|
if (childOrderList103.size() > 0) { |
|
|
|
@ -784,13 +785,14 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for (String s : rechargePlatform) { |
|
|
|
|
TimeUnit.SECONDS.sleep(1); |
|
|
|
|
System.out.println("-----------------------------------------------------------------------------------------------------------------------------------------------------" + new Date()); |
|
|
|
|
// 尖椒充值
|
|
|
|
|
if (s.equals("1") && type == 1) { |
|
|
|
|
object.put("out_order_id", orderNo); |
|
|
|
|
object.put("amount", outRechargePrice.getRechargePrice()); |
|
|
|
|
object.put("mobile", outRechargeOrder.getRechargeContent()); |
|
|
|
|
object.put("notifyUrl", CommonSysConst.getSysConfig().getJjNotifyUrl()); |
|
|
|
|
System.out.println("outRechargeOrder-----------------------------------------------------------------------------------------------------------------------------------------------------" + outRechargePrice.getRechargeType()); |
|
|
|
|
if (outRechargeOrder.getRechargeType() == 1) { |
|
|
|
|
object.put("is_fast", 1); |
|
|
|
|
} |
|
|
|
|