Browse Source

Merge branch 'dev' into pre-production

newStockUp
pref_mail@163.com 1 year ago
parent
commit
a14cc301e6
  1. 9
      blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
  2. 14
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
  3. 33
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
  4. 36
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java

9
blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@ -433,7 +433,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceEntity = new AdvanceEntity(); advanceEntity = new AdvanceEntity();
advanceEntity.setOrderSelfNum(StringUtil.isBlank(factoryOrderEntity.getSelfCode()) ? "" : factoryOrderEntity.getSelfCode()); //订单自编号 advanceEntity.setOrderSelfNum(StringUtil.isBlank(factoryOrderEntity.getSelfCode()) ? "" : factoryOrderEntity.getSelfCode()); //订单自编号
advanceEntity.setSiteName(receivingOrderEntity.getCurrentWarehouseName()); // 基地 TODO 需要映射 advanceEntity.setSiteName(receivingOrderEntity.getFromWarehouseName()); // 基地 TODO 需要映射
advanceEntity.setArea(""); // 区域 advanceEntity.setArea(""); // 区域
advanceEntity.setOrderTypeName(""); //订单类型名称 可以为空 advanceEntity.setOrderTypeName(""); //订单类型名称 可以为空
advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空 advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空
@ -444,8 +444,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceEntity.setMctsTruckNo(receivingOrderEntity.getPlate());// 车牌//字段没有了 advanceEntity.setMctsTruckNo(receivingOrderEntity.getPlate());// 车牌//字段没有了
advanceEntity.setFirstPackName(""); //一级品类 advanceEntity.setFirstPackName(""); //一级品类
advanceEntity.setFirstPackCode(""); //一级品类 advanceEntity.setFirstPackCode(""); //一级品类
advanceEntity.setDealerName(factoryOrderEntity.getShopReceiver()); //商场名称 advanceEntity.setDealerName(factoryOrderEntity.getShopName()); //商场名称
advanceEntity.setDealerCode(""); //商场编码 advanceEntity.setDealerCode(factoryOrderEntity.getShopCode()); //商场编码
advanceEntity.setDueDate(""); // 交期 advanceEntity.setDueDate(""); // 交期
advanceEntity.setIsOpai(0); //是否干仓配 advanceEntity.setIsOpai(0); //是否干仓配
advanceEntity.setOrderNum("");//MSCS订单号 可以为空 advanceEntity.setOrderNum("");//MSCS订单号 可以为空
@ -455,7 +455,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceEntity.setCustomerRoad(StringUtil.isBlank(factoryOrderEntity.getCustomerAddress()) ? "" : factoryOrderEntity.getCustomerAddress());//顾客地址 advanceEntity.setCustomerRoad(StringUtil.isBlank(factoryOrderEntity.getCustomerAddress()) ? "" : factoryOrderEntity.getCustomerAddress());//顾客地址
advanceEntity.setSystemType("线上"); //订单类型 advanceEntity.setSystemType("线上"); //订单类型
advanceEntity.setStoreNo(StringUtil.isBlank(factoryOrderEntity.getStoreCode()) ? "" : factoryOrderEntity.getStoreCode()); //门店编码 advanceEntity.setStoreNo(StringUtil.isBlank(factoryOrderEntity.getStoreCode()) ? "" : factoryOrderEntity.getStoreCode()); //门店编码
advanceEntity.setStoreName(StringUtil.isBlank(factoryOrderEntity.getStoreName()) ? "" : factoryOrderEntity.getStoreCode()); //门店名称 advanceEntity.setStoreName(StringUtil.isBlank(factoryOrderEntity.getStoreName()) ? "" : factoryOrderEntity.getStoreName()); //门店名称
advanceEntity.setSerialKey(""); //序列号 advanceEntity.setSerialKey(""); //序列号
advanceEntity.setServiceNum(StringUtil.isBlank(factoryOrderEntity.getServiceNumber()) ? "" : factoryOrderEntity.getServiceNumber()); //服务号 advanceEntity.setServiceNum(StringUtil.isBlank(factoryOrderEntity.getServiceNumber()) ? "" : factoryOrderEntity.getServiceNumber()); //服务号
advanceEntity.setMatingCode("");//齐套模式 可以为空 advanceEntity.setMatingCode("");//齐套模式 可以为空
@ -472,7 +472,6 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
// Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId()); // Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId());
// 获取基地对应的ID // 获取基地对应的ID
advanceEntity.setWarehouseId(warehourseId); //导入人仓库id TODO 需要提供映射 advanceEntity.setWarehouseId(warehourseId); //导入人仓库id TODO 需要提供映射
advanceEntity.setWaybillStatus(Byte.parseByte("1"));//开单状态:1=未开单,2=已开单 advanceEntity.setWaybillStatus(Byte.parseByte("1"));//开单状态:1=未开单,2=已开单

14
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.json.JsonMapper;
import com.logpm.factory.comfac.constant.FactoryConstant;
import com.logpm.factory.comfac.dto.*; import com.logpm.factory.comfac.dto.*;
import com.logpm.factory.mt.dto.*; import com.logpm.factory.mt.dto.*;
import com.logpm.factory.mt.entity.*; import com.logpm.factory.mt.entity.*;
@ -283,25 +284,24 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
@Override @Override
public R handleStatusData(OrderStatusDTO orderStatusDTO) throws CustomerException, JsonProcessingException, NoSuchAlgorithmException { public R handleStatusData(OrderStatusDTO orderStatusDTO) throws CustomerException, JsonProcessingException, NoSuchAlgorithmException {
logger.info("#############handleStatusData: orderStatusDTO={}", orderStatusDTO); logger.info("TAG {} #############handleStatusData: orderStatusDTO={}", FactoryConstant.MENGT,orderStatusDTO);
String status = orderStatusDTO.getStatus(); String status = orderStatusDTO.getStatus();
// if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status) || "8".equals(status) || "9".equals(status)) {
//
// }
R rd = null; R rd = null;
try{
if("4".equals(status)){ if("4".equals(status)){
rd = shouhuoruku(orderStatusDTO); rd = shouhuoruku(orderStatusDTO);
}else if("7".equals(status)){ }else if("7".equals(status)){
rd = qianshouScan(orderStatusDTO); rd = qianshouScan(orderStatusDTO);
}else{ }else{
logger.info("#############handleStatusData: 当前数据的状态不推送 status={}", status);
return Resp.fail(400, "当前数据的状态不推送"); return Resp.fail(400, "当前数据的状态不推送");
} }
}catch (Exception e){
rd = Resp.fail(401,e.getMessage());
logger.error("TAG {} ############# error {}", FactoryConstant.MENGT, e.getMessage());
}
logger.info("##################orderStatusHandler: 异常tag={}", 0);
return rd; return rd;

33
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@ -318,7 +318,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
String unitNo = orderStatusDTO.getUnitNo(); String unitNo = orderStatusDTO.getUnitNo();
String operationTime = orderStatusDTO.getOperationTime(); String operationTime = orderStatusDTO.getOperationTime();
if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status) || "8".equals(status) || "9".equals(status)) { if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status) || "8".equals(status) || "9".equals(status)) {
log.warn(FactoryConstant.OUPAI,"#############oupai-handleStatusData: 当前数据的状态不推送 status={}", status); log.warn("#############oupai-handleStatusData: 当前数据的状态不推送 status={}", status);
return Resp.fail(400, "当前数据的状态不推送"); return Resp.fail(400, "当前数据的状态不推送");
} }
@ -332,12 +332,12 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
} }
String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id
if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) { if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) {
log.warn(FactoryConstant.OUPAI,"##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId); log.warn("##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
return Resp.fail(400, "仓库数据有误"); return Resp.fail(400, "仓库数据有误");
} }
if (!currentWarehouseId.equals(destinationWarehouseId)) { if (!currentWarehouseId.equals(destinationWarehouseId)) {
log.info(FactoryConstant.OUPAI,"##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId); log.info("##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
return Resp.fail(400, "不是目的仓"); return Resp.fail(400, "不是目的仓");
} }
@ -350,7 +350,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
// 如何判断这个包间是非干仓配的数据 // 如何判断这个包间是非干仓配的数据
if (!"经销商".equals(factoryOrder.getBusinessModel())) { if (!"经销商".equals(factoryOrder.getBusinessModel())) {
log.info(FactoryConstant.OUPAI,"oupai- 该包条为干仓配的数据类型 不进行推送 >>> unitNo={} businessModel:{}", unitNo, factoryOrder.getBusinessModel()); log.info("oupai- 该包条为干仓配的数据类型 不进行推送 >>> unitNo={} businessModel:{}", unitNo, factoryOrder.getBusinessModel());
return Resp.fail(400, "包条为干仓配的数据类型"); return Resp.fail(400, "包条为干仓配的数据类型");
} }
@ -358,7 +358,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
ReceivingOrderEntity receivingOrderEntity = receivingOrderMapper.selectById(factoryOrder.getReceivingId()); ReceivingOrderEntity receivingOrderEntity = receivingOrderMapper.selectById(factoryOrder.getReceivingId());
if (Objects.isNull(receivingOrderEntity)) { if (Objects.isNull(receivingOrderEntity)) {
log.info(FactoryConstant.OUPAI,"oupai- 该订单为没有收货单 不进行推送 >>> receivingId={} ", factoryOrder.getReceivingId()); log.info(" 该订单为没有收货单 不进行推送 >>> receivingId={} ", factoryOrder.getReceivingId());
return Resp.fail(400, "未查询到该单据推送收货单信息"); return Resp.fail(400, "未查询到该单据推送收货单信息");
} }
@ -367,7 +367,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
detailObject.put("WarehouseBelong", "oppein"); detailObject.put("WarehouseBelong", "oppein");
detailObject.put("Creator", orderStatusDTO.getUsername()); detailObject.put("Creator", orderStatusDTO.getUsername());
detailObject.put("PackageCode", unitNo); detailObject.put("PackageCode", unitNo);
detailObject.put("Operate", "货"); detailObject.put("Operate", "货");
// 查询系统的包件对象 // 查询系统的包件对象
LambdaQueryWrapper<FactoryPackageEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<FactoryPackageEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@ -379,9 +379,10 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
OpPackagePushLogEntity opPackagePushLogEntity = sendPushOuPaiData(factoryPackageEntity.getId(), url, 1, detailObject); OpPackagePushLogEntity opPackagePushLogEntity = sendPushOuPaiData(factoryPackageEntity.getId(), url, 1, detailObject);
// 需要盘点这个对象的 // 需要盘点这个对象的
String resp = opPackagePushLogEntity.getResp(); String resp = opPackagePushLogEntity.getResp();
// 转换为json // 转换为json
// JSONObject respJson = JSONObject.parseObject(resp); // JSONObject respJson = JSONObject.parseObject(resp);
log.info(FactoryConstant.OUPAI,">>>>>>>>>>>>>>>>>>>>>>> 推送欧派返回数据 {}", resp); log.info(" >>>>>>>>>>>>>>>>>>>>>>> 推送欧派返回数据 {}",resp);
// TODO: 2023/10/25 不知道返回成功的状态是多少 // TODO: 2023/10/25 不知道返回成功的状态是多少
// 需要修改包件对应的状态 // 需要修改包件对应的状态
@ -418,7 +419,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
try { try {
rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_SIGN_EXCHANGE, RabbitConstant.OUPAI_SIGN_ROUTING, map); rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_SIGN_EXCHANGE, RabbitConstant.OUPAI_SIGN_ROUTING, map);
} catch (Exception e) { } catch (Exception e) {
log.error(FactoryConstant.OUPAI,"############handlePackageData: {}", e.getMessage()); log.error("############handlePackageData: {}", e.getMessage());
} }
} }
@ -521,11 +522,11 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
try { try {
JSONObject jsonObject = JSONObject.parseObject(opOrderStatusLogEntity.getResponseBody()); JSONObject jsonObject = JSONObject.parseObject(opOrderStatusLogEntity.getResponseBody());
JSONArray resultArray = jsonObject.getJSONArray("value"); JSONArray resultArray = jsonObject.getJSONArray("value");
log.info(FactoryConstant.OUPAI,"############handleData: 数据处理开始"); log.info("############handleData: 数据处理开始");
analyzeData(resultArray); analyzeData(resultArray);
opOrderStatusLogEntity.setDataStatus(1); opOrderStatusLogEntity.setDataStatus(1);
} catch (Exception e) { } catch (Exception e) {
log.error(FactoryConstant.OUPAI,">>>> error {}", e.getMessage()); log.error(">>>> TAG {} error {}",FactoryConstant.OUPAI, e.getMessage());
opOrderStatusLogEntity.setDataStatus(2); opOrderStatusLogEntity.setDataStatus(2);
} }
@ -542,7 +543,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
for (int i = 0; i < resultArray.size(); i++) { for (int i = 0; i < resultArray.size(); i++) {
JSONObject valueObject = resultArray.getJSONObject(i); JSONObject valueObject = resultArray.getJSONObject(i);
if (Objects.isNull(valueObject)) { if (Objects.isNull(valueObject)) {
log.warn(FactoryConstant.OUPAI,"############handleData: value中没有数据"); log.warn("############handleData: value中没有数据");
throw new CustomerException(403, "value中没有数据"); throw new CustomerException(403, "value中没有数据");
} }
JSONObject fromWarehouse = valueObject.getJSONObject("FromWarehouse"); JSONObject fromWarehouse = valueObject.getJSONObject("FromWarehouse");
@ -613,7 +614,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
JSONObject packageEntity = packages.getJSONObject(j);//包件信息 JSONObject packageEntity = packages.getJSONObject(j);//包件信息
JSONObject orderEntity = packageEntity.getJSONObject("Order");//订单信息 JSONObject orderEntity = packageEntity.getJSONObject("Order");//订单信息
if(orderEntity==null){ if(orderEntity==null){
log.info(FactoryConstant.OUPAI,"包件数据没有订单信息 packageCode {}",packageEntity.getString("Code")); log.info("包件数据没有订单信息 packageCode {}",packageEntity.getString("Code"));
continue; continue;
} }
String selfCode = orderEntity.getString("SelfCode");//订单自编码 String selfCode = orderEntity.getString("SelfCode");//订单自编码
@ -719,7 +720,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
factoryOrderEntity.setTurnStatus(0); factoryOrderEntity.setTurnStatus(0);
boolean save = factoryOrderService.save(factoryOrderEntity); boolean save = factoryOrderService.save(factoryOrderEntity);
if (!save) { if (!save) {
log.warn(FactoryConstant.OUPAI,"############handleData: 保存订单失败 selfCode={}", selfCode); log.warn("############handleData: 保存订单失败 selfCode={}", selfCode);
throw new CustomerException(403, "保存订单失败"); throw new CustomerException(403, "保存订单失败");
} }
} }
@ -824,19 +825,19 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
} }
} }
} else { } else {
log.info(FactoryConstant.OUPAI,"############handleData: 包件码已存在 packageCode={}", packageCode); log.info("############handleData: 包件码已存在 packageCode={}", packageCode);
throw new CustomerException(403, "包件码已存在"); throw new CustomerException(403, "包件码已存在");
} }
} }
} else { } else {
log.error(FactoryConstant.OUPAI,"############handleData: 保存发货单数据失败 code={}", code); log.error("############handleData: 保存发货单数据失败 code={}", code);
throw new CustomerException(403, "保存发货单数据失败"); throw new CustomerException(403, "保存发货单数据失败");
} }
Date end = new Date(); Date end = new Date();
long startLong = start.getTime(); long startLong = start.getTime();
long endLong = end.getTime(); long endLong = end.getTime();
long l = endLong - startLong; long l = endLong - startLong;
log.info(FactoryConstant.OUPAI,"############handleData: 数据处理完成 耗时 {} 毫秒", l); log.info("############handleData: 数据处理完成 耗时 {} 毫秒", l);
} }
} }

36
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java

@ -9,7 +9,6 @@ import com.logpm.factory.zb.service.IZbFactoryDataService;
import com.logpm.oldproject.entity.AdvanceEntity; import com.logpm.oldproject.entity.AdvanceEntity;
import com.logpm.oldproject.feign.IAdvanceClient; import com.logpm.oldproject.feign.IAdvanceClient;
import com.rabbitmq.client.Channel; import com.rabbitmq.client.Channel;
import lombok.Builder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.RabbitConstant; import org.springblade.common.constant.RabbitConstant;
import org.springblade.common.exception.CustomerException; import org.springblade.common.exception.CustomerException;
@ -49,7 +48,6 @@ public class OrderStatusHandler {
@Autowired @Autowired
private IOuPaiFactoryService ouPaiFactoryService; private IOuPaiFactoryService ouPaiFactoryService;
private Integer retryCount = 1;
@RabbitHandler @RabbitHandler
public void orderStatusHandler(Map map, Message message, Channel channel) throws IOException, NoSuchAlgorithmException { public void orderStatusHandler(Map map, Message message, Channel channel) throws IOException, NoSuchAlgorithmException {
@ -72,39 +70,26 @@ public class OrderStatusHandler {
switch (type) { switch (type) {
case FactoryConstant.PIANO: case FactoryConstant.PIANO:
r = panFactoryDataService.handleStatusData(orderStatusDTO); r = panFactoryDataService.handleStatusData(orderStatusDTO);
int code = r.getCode(); if (r.getCode() == 400 || r.getCode() == 200) {
if (code == 400 || code == 200) { log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.PIANO, orderSelfNum);
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
// channel.basicAck(deliveryTag,true); // channel.basicAck(deliveryTag,true);
} else { } else {
throw new CustomerException(code, r.getMsg()); throw new CustomerException(r.getCode(), r.getMsg());
} }
break; break;
case FactoryConstant.MENGT: case FactoryConstant.MENGT:
try {
r = mtFactoryDataService.handleStatusData(orderStatusDTO); r = mtFactoryDataService.handleStatusData(orderStatusDTO);
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum); if (r.getCode() == 400 || r.getCode() == 200) {
log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.MENGT, orderSelfNum);
} catch (CustomerException rc) {
rc.printStackTrace();
if (200 != rc.code || 400 != rc.code) {
throw new CustomerException("程序异常,需要重试");
}
}
code = r.getCode();
if (code == 400 || code == 200) {
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
// channel.basicAck(deliveryTag,true);
} else { } else {
throw new CustomerException(code, r.getMsg()); throw new CustomerException(r.getCode(), r.getMsg());
} }
break; break;
case FactoryConstant.ZHIBANG: case FactoryConstant.ZHIBANG:
r = zbFactoryDataService.handleStatusData(orderStatusDTO); r = zbFactoryDataService.handleStatusData(orderStatusDTO);
int resultCode = r.getCode(); int resultCode = r.getCode();
if (resultCode == 400 || resultCode == 200) { if (resultCode == 400 || resultCode == 200) {
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum); log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.ZHIBANG, orderSelfNum);
// channel.basicAck(deliveryTag,true); // channel.basicAck(deliveryTag,true);
} else { } else {
throw new CustomerException(resultCode, r.getMsg()); throw new CustomerException(resultCode, r.getMsg());
@ -113,7 +98,12 @@ public class OrderStatusHandler {
case FactoryConstant.OUPAI: case FactoryConstant.OUPAI:
r = ouPaiFactoryService.handleStatusData(orderStatusDTO); r = ouPaiFactoryService.handleStatusData(orderStatusDTO);
if (r.getCode() == 400 || r.getCode() == 200) {
log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.OUPAI, orderSelfNum);
// channel.basicAck(deliveryTag,true);
} else {
throw new CustomerException(r.getCode(), r.getMsg());
}
default: default:

Loading…
Cancel
Save