generated from root/miduo_server
订单代码格式优化
parent
a9c7096887
commit
341d511407
|
|
@ -119,8 +119,8 @@ public class OrderInfoController {
|
||||||
// 循环遍历
|
// 循环遍历
|
||||||
for (Map.Entry<String, CGPayOrder> entry : orderHashMap.entrySet()) {
|
for (Map.Entry<String, CGPayOrder> entry : orderHashMap.entrySet()) {
|
||||||
CGPayOrder cgPayOrder = entry.getValue();
|
CGPayOrder cgPayOrder = entry.getValue();
|
||||||
int server = cgPayOrder.getServerId();
|
|
||||||
// 服务器验证
|
// 服务器验证
|
||||||
|
int server = cgPayOrder.getServerId();
|
||||||
if(Integer.parseInt(serverId) != 0 && server != Integer.parseInt(serverId)) {
|
if(Integer.parseInt(serverId) != 0 && server != Integer.parseInt(serverId)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -139,18 +139,11 @@ public class OrderInfoController {
|
||||||
if (payTime < startTime || payTime > endTime){
|
if (payTime < startTime || payTime > endTime){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 金额获取
|
// 金额获取
|
||||||
String amount = cgPayOrder.getAmount();
|
String amount = cgPayOrder.getAmount();
|
||||||
double amountDouble;
|
double amountDouble = 0d;
|
||||||
if(amount==null){
|
if(amount != null){
|
||||||
amountDouble = 0d;
|
amountDouble = !amount.contains(".") ? Integer.parseInt(amount)/100D : Double.parseDouble(amount);
|
||||||
}else{
|
|
||||||
if(!amount.contains(".")){
|
|
||||||
amountDouble = Integer.parseInt(amount)/100D;
|
|
||||||
} else{
|
|
||||||
amountDouble = Double.parseDouble(amount);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// 订单初始化
|
// 订单初始化
|
||||||
Corder corder = new Corder();
|
Corder corder = new Corder();
|
||||||
|
|
@ -161,6 +154,12 @@ public class OrderInfoController {
|
||||||
corder.setServerId(String.valueOf(server));
|
corder.setServerId(String.valueOf(server));
|
||||||
corder.setPaySdk(cgPayOrder.getPaySdk());
|
corder.setPaySdk(cgPayOrder.getPaySdk());
|
||||||
corder.setPlatform(cgPayOrder.getPlatform());
|
corder.setPlatform(cgPayOrder.getPlatform());
|
||||||
|
corder.setRecharge_type(cgPayOrder.getRecharge_type());
|
||||||
|
// 空值下面有处理
|
||||||
|
corder.setRegisterTime("");
|
||||||
|
corder.setOpenId("");
|
||||||
|
// 渠道id赋值
|
||||||
|
corder.setCc_id(channelMap.getOrDefault(Integer.valueOf(ccId),ccId));
|
||||||
|
|
||||||
// 获取订单配置
|
// 获取订单配置
|
||||||
SRechargeCommodityConfig config = SRechargeCommodityConfig.sdkRechargeCommodityConfigMap.get(cgPayOrder.getGoodsId());
|
SRechargeCommodityConfig config = SRechargeCommodityConfig.sdkRechargeCommodityConfigMap.get(cgPayOrder.getGoodsId());
|
||||||
|
|
@ -184,18 +183,12 @@ public class OrderInfoController {
|
||||||
// 礼包内容文字化
|
// 礼包内容文字化
|
||||||
corder.setProductContent(builder.substring(0,builder.length()-1).toString());
|
corder.setProductContent(builder.substring(0,builder.length()-1).toString());
|
||||||
}
|
}
|
||||||
corder.setRecharge_type(cgPayOrder.getRecharge_type());
|
|
||||||
corder.setRegisterTime("");
|
|
||||||
corder.setOpenId("");
|
|
||||||
// 用户信息获取
|
// 用户信息获取
|
||||||
GSUserFinal gsUser = gsUserDao.findUserInfoCache(server,Integer.valueOf(accountid));
|
GSUserFinal gsUser = gsUserDao.findUserInfoCache(server,Integer.valueOf(accountid));
|
||||||
if (gsUser != null){
|
if (gsUser != null){
|
||||||
corder.setRegisterTime(gsUser.getCreateTime());
|
corder.setRegisterTime(gsUser.getCreateTime());
|
||||||
corder.setOpenId(gsUser.getOpenId());
|
corder.setOpenId(gsUser.getOpenId());
|
||||||
}
|
}
|
||||||
// 渠道id赋值
|
|
||||||
corder.setCc_id(Optional.ofNullable(channelMap.get(Integer.valueOf(ccId))).orElse(ccId));
|
|
||||||
|
|
||||||
cgPayOrders.add(corder);
|
cgPayOrders.add(corder);
|
||||||
}
|
}
|
||||||
LOGGER.info("导出订单操作,redis查询耗时:{}毫秒",DateUtil.now()-now);
|
LOGGER.info("导出订单操作,redis查询耗时:{}毫秒",DateUtil.now()-now);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue