记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit f2843d7e authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

去掉更新total num

parent e8d899ad
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 59 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java
View file @ f2843d7e
......@@ -3,10 +3,8 @@ package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
import com.liquidnet.client.admin.common.annotation.Log;
import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.domain.entity.SysUser;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BusinessType;
import com.liquidnet.client.admin.common.utils.ShiroUtils;
import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderExpressExportExcelListDao;
import com.liquidnet.client.admin.zhengzai.kylin.dto.performancesExpressImportVo;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java
View file @ f2843d7e
......@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.core.domain.entity.SysUser;
import com.liquidnet.client.admin.common.exception.BusinessException;
import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.client.admin.common.utils.security.Md5Utils;
import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.CodeUtil;
import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.UploadUtil;
import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.ZipMultiFileUtil;
......@@ -218,7 +216,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/placeOrder");
// System.out.println(result);
HashMap hashMap = new HashMap();
try {
hashMap = JsonUtils.fromJson(result, HashMap.class);
......@@ -293,24 +290,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
kylinOrderExpressVo.setMailno(kylinOrderExpress.getMailno());
kylinOrderExpressVo.setExpressStatus(kylinOrderExpress.getExpressStatus());
dataUtils.setOrderExpressInfo(orderTicketsId, kylinOrderExpressVo);
// 记录演出数量
KylinOrderTicketRelations relationsInfo = kylinOrderTicketRelationsMapper.selectOne(new QueryWrapper<KylinOrderTicketRelations>().eq("order_id", orderTicketsId));
KylinOrderExpressPerformances expressPerformances = kylinOrderExpressPerformancesMapper.selectOne(new QueryWrapper<KylinOrderExpressPerformances>().eq("performances_id", relationsInfo.getPerformanceId()));
KylinOrderExpressPerformances kylinOrderExpressPerformances = new KylinOrderExpressPerformances();
if (null == expressPerformances) {
String orderExpressPerformancesId = IDGenerator.nextSnowId();
kylinOrderExpressPerformances.setOrderExpressPerformancesId(orderExpressPerformancesId);
kylinOrderExpressPerformances.setPerformancesId(relationsInfo.getPerformanceId());
kylinOrderExpressPerformances.setTotal1(1);
kylinOrderExpressPerformances.setCreatedAt(DateUtil.getNowTime());
kylinOrderExpressPerformancesMapper.insert(kylinOrderExpressPerformances);
} else {
kylinOrderExpressPerformances.setTotal1(expressPerformances.getTotal1() + 1);
kylinOrderExpressPerformances.setUpdatedAt(DateUtil.getNowTime());
kylinOrderExpressPerformancesMapper.update(kylinOrderExpressPerformances,
new QueryWrapper<KylinOrderExpressPerformances>().eq("performances_id", relationsInfo.getPerformanceId()));
}
}
}
return ResponseDto.success();
......@@ -347,18 +326,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
, new UpdateWrapper<KylinOrderExpress>().in("order_express_id", orderExpressInfo.getOrderExpressId())
);
dataUtils.delOrderExpressInfo(orderTicketsId);
mongoTemplate.remove(Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)), KylinOrderExpressRouteVo.class.getSimpleName());
// 记录演出数量
KylinOrderTicketRelations relationsInfo = kylinOrderTicketRelationsMapper.selectOne(new QueryWrapper<KylinOrderTicketRelations>().eq("order_id", orderTicketsId));
KylinOrderExpressPerformances expressPerformances = kylinOrderExpressPerformancesMapper.selectOne(new QueryWrapper<KylinOrderExpressPerformances>().eq("performances_id", relationsInfo.getPerformanceId()));
KylinOrderExpressPerformances kylinOrderExpressPerformances = new KylinOrderExpressPerformances();
if (null != expressPerformances) {
kylinOrderExpressPerformances.setTotal1(expressPerformances.getTotal1() - 1);
kylinOrderExpressPerformances.setUpdatedAt(DateUtil.getNowTime());
kylinOrderExpressPerformancesMapper.update(kylinOrderExpressPerformances,
new QueryWrapper<KylinOrderExpressPerformances>().eq("performances_id", relationsInfo.getPerformanceId()));
}
}
}
}
......@@ -379,7 +346,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getResult");
HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
// System.out.println(result);
if (hashMap.get("succ").equals("fail")) {
String msg = (String) hashMap.get("msg");
return ResponseDto.failure(msg);
......@@ -432,7 +398,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getFreight");
HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
// System.out.println(result);
if (hashMap.get("succ").equals("fail")) {
String msg = (String) hashMap.get("msg");
return ResponseDto.failure(msg);
......@@ -459,7 +424,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
Wrappers.lambdaQuery(KylinOrderExpress.class).eq(KylinOrderExpress::getOrderExpressId, orderExpressId)
);
String orderTicketsId = orderExpressInfo.getOrderTicketsId();
if (null != orderExpressInfo) {
Map<String, String> hBody = new HashMap<>();
hBody.put("orderId", orderExpressInfo.getOrderExpressCode());
......@@ -467,7 +431,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getListFreight");
HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
// System.out.println(result);
if (hashMap.get("succ").equals("fail")) {
String msg = (String) hashMap.get("msg");
return ResponseDto.failure(msg);
......@@ -496,7 +459,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
public ResponseDto listOrderRoute(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<String> ids = performanceExpressSearchAdminParam.getIds();
Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
for (String orderExpressId : ids) {
KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
Wrappers.lambdaQuery(KylinOrderExpress.class).eq(KylinOrderExpress::getOrderExpressId, orderExpressId)
......@@ -508,7 +470,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/listOrderRoute");
HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
// System.out.println(result);
if (hashMap.get("succ").equals("fail")) {
String msg = (String) hashMap.get("msg");
return ResponseDto.failure(msg);
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java
View file @ f2843d7e
......@@ -158,24 +158,6 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
routeList.addFirst(kylinOrderExpressRouteVo);
dataUtils.setOrderExpressRoute(orderExpressInfo.getOrderTicketsId(), routeList);
// 记录演出数量
if (50 == Integer.valueOf(performanceExpressPushRouteParam.getOpCode()) || 80 == Integer.valueOf(performanceExpressPushRouteParam.getOpCode())) {
KylinOrderTicketRelations relationsInfo = kylinOrderTicketRelationsMapper.selectOne(new QueryWrapper<KylinOrderTicketRelations>().eq("order_id", orderExpressInfo.getOrderTicketsId()));
KylinOrderExpressPerformances expressPerformances = kylinOrderExpressPerformancesMapper.selectOne(new QueryWrapper<KylinOrderExpressPerformances>().eq("performances_id", relationsInfo.getPerformanceId()));
KylinOrderExpressPerformances kylinOrderExpressPerformances = new KylinOrderExpressPerformances();
if (null != expressPerformances) {
if (50 == Integer.valueOf(performanceExpressPushRouteParam.getOpCode())) {
kylinOrderExpressPerformances.setTotal2(expressPerformances.getTotal2() + 1);
}
if (80 == Integer.valueOf(performanceExpressPushRouteParam.getOpCode())) {
kylinOrderExpressPerformances.setTotal3(expressPerformances.getTotal3() + 1);
}
kylinOrderExpressPerformances.setUpdatedAt(DateUtil.getNowTime());
kylinOrderExpressPerformancesMapper.update(kylinOrderExpressPerformances,
new QueryWrapper<KylinOrderExpressPerformances>().eq("performances_id", relationsInfo.getPerformanceId()));
}
}
return true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment