Skip to content

O
order-group
Commit fe8f603c by ping.wu
Options

删除、注释无用代码

parent 3f8d4635
Showing with 109 additions and 366 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -84,13 +84,11 @@ import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
@Component
public class OrderAdapter {
private static FastDateFormat yyyyMMdd = FastDateFormat.getInstance("yyyy-MM-dd", Locale.CHINA);
private static FastDateFormat yyyyMMddHHmmss = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
private static String SPMCHID = "1237482502";
private static String SPWXAPPID = "wx8244c7c48c7d45de";
private static String ENTRYPAGE = "pages/storeListShop";
// private static String SPWXAPPID = "wx8244c7c48c7d45de";
// private static String ENTRYPAGE = "pages/storeListShop";
private static String SERIALNO = "3425DD6C131D637D7316076C4A44E1CBEFE3DB55";
private static String privatekey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDO+3Q6YX6843Qo5Okhum74yG7zpJ8NbWk9EugJwxW9AZuZI3fziAW5+EblEkx0ZeXYX/GvztjRUZ+MA4eHAXnAdzhiTO46LOePtjQXXqPVOHKEhkfa/5qvJSzJ1Ei8ICrA1hQOGF0sqxMmFNpWaXJkHZ7rJ4KRir8osVeWEF8l8xWEktpXVzspT1PGt7T9i9cQO/lMFYP9nq4qr0pZ4rGgpjURjuZHam5E9l6IFP0VVBvyYP96c/9rUgDeLtPqRDCfQC3WYUtA34XudM/HaGCSPvg5ui5Q2sWob10YFP2F8iTCBHDE3rR1s+inYjS4oXd/TCWQ7+C/O7L9h5AKEFAZAgMBAAECggEAGNFJpF5gReG34ddgpKyn9aiCtS/96iw+PBZyQAlmJ91zfK8mCMs8dInyZjEFfcdiAcmvPvc8RAzXZoBd1bA1mwAwgIjc35jWwwKDyHGOj1hPUtiO8RFIyMtaTXDor7Xjqm+AxBfjxCFXEG/bphTKpHpwvZ1lKHJMbWKmL9YSsof1zK12FC5nFxA0mrPlpYHWFmbeMLu7ngDTGEA5AepKv+BZcqMEJGQvAgskGHdsLSd2NoadUQoFz0ZOrXAXlqNQpODUqRTm3besq2ClBaa2JNEG/KxGqZGM11jsTaduH5WhUubb53OJ8pbkw3ROept9fW25QX/k3ORJ3Xmq+g4gAQKBgQDqbRE1mrfEYW0yjnb6FKx+0jHcU/RNuqflCCoWaEzzNJbMzTxuYvyyR7bhT07B26Qji2ic3T/qUokMXpavadZItH8QegTf3eCtDWU1a6RdPkS+NvRT3NaJstbPnGEEavcbS4y45phE9637rhn7WpaWCmw4ggaawNH/lo7kOBCqGQKBgQDiB9PpW7gumtFlNqw6HVcdl/1SvIOWPujvzYNnFkp3ZWDf/hF7XWno3+w27kA/ox9X7A7ejZZgPsR1+QVgbAGCRDs7qVM77r0XddXtKatCnENWsIER11+SAHwXNI+OzVJyivxqc8MqKVt/TdIIRlOXmrDtBLWXrKtJ6+fpRZ2WAQKBgG1T2EbLlRB871Q4pLwUkC3FEYPTk4f8mPhzSk2Q7vItgHaa8Kf6eica0utY9T3rlS0OgwdFF93MCCZApr2/+jOGGgwxG7zb2UBbkuvK+6iQtbaQInpJ77PgN9Yy8/v/dqbAISzKPhFMAVPy6iMTKE9pJPdljHb3nfg42wMMMplhAoGAYV2r3F9FNNY+E1J82D/hUf8yAZzxNhx9bSdjTlnc1BfYpkSktTalM8qZz4PMK12SV+Z49UeamnUPXh5aQZHlCH9p4KZtE2khDWUWNSZ4/qWfoE1CHDRhl9wbmEds+7/YnzzdxOF/Fb9hCbK1IhlhUvIw+rjHnMGlu58idGsnmgECgYAk+2mWAoGUaQdgPHc0Ts8AiZ1CB2HcWEakFD4yYfVYL107OkxfSXd7dlaVklCHbHaMUYuT4euIfJzXfaTjEnImqQu2hs9u1yTyJHKwjj9gyWHYfcr4byiXjKnbwMkNCrrHWMXCKZ3/F0FQWRE9lsIHZYkFUUUoZYmSorbBf815HQ==";
......@@ -102,8 +100,8 @@ public class OrderAdapter {
private ShoppingCartAdapter shoppingCartAdapter;
@Autowired
private CacheOpenPlatformPartnerWxappConfigManager cacheWxappConfigManager;
@Autowired
private RedisCache redisCache;
// @Autowired
// private RedisCache redisCache;
@Autowired
private OrderCommonService orderCommonService;
......@@ -115,7 +113,7 @@ public class OrderAdapter {
* @return
*/
public BaseCreateOrderRequest convent2CreateOrderDto(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto,StoreResponse.BizVO storeResponseDto) {
UserDeliveryInfoDto deliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
// UserDeliveryInfoDto deliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
BaseCreateOrderRequest createOrderDto = getCreateOrderDto(createOrderVo);
OrderTaskReq orderTask = null;
if(StringUtils.isNotEmpty(createOrderVo.getTakeMealTime())){
......@@ -194,7 +192,7 @@ public class OrderAdapter {
}
Long scoreReduceAmount = shoppingCartGoodsDto.getScoreReduceAmount() != null ? shoppingCartGoodsDto.getScoreReduceAmount() : 0;
if (scoreReduceAmount > 0 && CustomerScoreConstant.SUBSTRACT.getValue().equals(createOrderVo.getUseCustomerScore())) {
Integer reduceScore = shoppingCartGoodsDto.getReduceScore() != null ? shoppingCartGoodsDto.getReduceScore().intValue() : 0;
// Integer reduceScore = shoppingCartGoodsDto.getReduceScore() != null ? shoppingCartGoodsDto.getReduceScore().intValue() : 0;
CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
.accountId("")
.name("积分扣减")
......@@ -493,13 +491,6 @@ public class OrderAdapter {
String latitude = userDeliveryInfoDto != null ? userDeliveryInfoDto.getUserLatitude() : "";
String longitude = userDeliveryInfoDto != null ? userDeliveryInfoDto.getUserLongitude() : "";
String remark = StringUtils.isNotBlank(createOrderVo.getOrderRemark()) ? createOrderVo.getOrderRemark() : "";
// StringBuffer takeMealTime = new StringBuffer("");
// Date takeMealDate = null;
// if (StringUtils.isNotBlank(createOrderVo.getTakeMealTime())) {
// takeMealTime = takeMealTime.append(DateUtil.convert2String(new Date(), "yyyy-MM-dd"))
// .append(" ").append(createOrderVo.getTakeMealTime()).append(":00");
// takeMealDate = DateUtil.convert2Date(takeMealTime.toString(), "yyyy-MM-dd HH:mm:ss");
// }
BaseCreateOrderRequest createOrderDto = new BaseCreateOrderRequest();
createOrderDto.setCompanyId(createOrderVo.getPartnerId());
createOrderDto.setShopId(createOrderVo.getShopId());
......@@ -554,15 +545,7 @@ public class OrderAdapter {
String latitude = userDeliveryInfoDto != null ? userDeliveryInfoDto.getUserLatitude() : "";
String longitude = userDeliveryInfoDto != null ? userDeliveryInfoDto.getUserLongitude() : "";
String remark = StringUtils.isNotBlank(createOrderVo.getOrderRemark()) ? createOrderVo.getOrderRemark() : "";
// StringBuffer takeMealTime = new StringBuffer("");
CreateFatherSonOrderRequest.OrderInfo productOrderInfo = new CreateFatherSonOrderRequest.OrderInfo();
// Date takeMealDate = null;
// if (StringUtils.isNotBlank(createOrderVo.getTakeMealTime())) {
// takeMealTime = takeMealTime.append(DateUtil.convert2String(new Date(), "yyyy-MM-dd"))
// .append(" ").append(createOrderVo.getTakeMealTime()).append(":00");
// takeMealDate = DateUtil.convert2Date(takeMealTime.toString(), "yyyy-MM-dd HH:mm:ss");
// productOrderInfo.setOrderTask(saveOrderTaskReq(orderWarnTime,takeMealDate.getTime()));
// }
productOrderInfo.setPartnerId(createOrderVo.getPartnerId());
productOrderInfo.setShopId(createOrderVo.getShopId());
productOrderInfo.setShopName(createOrderVo.getStoreName());
......@@ -590,10 +573,6 @@ public class OrderAdapter {
productOrderInfo.setAmount(0L);
productOrderInfo.setBarCounter(createOrderVo.getTableNumber());
productOrderInfo.setOrderClient(OrderClientType.SAAS.getIndex());
// if (StringUtils.isNotBlank(createOrderVo.getTakeMealTime())) {
// takeMealTime = takeMealTime.append(DateUtil.convert2String(new Date(), "yyyy-MM-dd"))
// .append(" ").append(createOrderVo.getTakeMealTime()).append(":00");
// }
ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
long deliveryAmount = 0;
long discountDeliveryAmount = 0;
......@@ -662,7 +641,7 @@ public class OrderAdapter {
}
Long scoreReduceAmount = shoppingCartGoodsDto.getScoreReduceAmount() != null ? shoppingCartGoodsDto.getScoreReduceAmount() : 0;
if (scoreReduceAmount > 0 && CustomerScoreConstant.SUBSTRACT.getValue().equals(createOrderVo.getUseCustomerScore())) {
Integer reduceScore = shoppingCartGoodsDto.getReduceScore() != null ? shoppingCartGoodsDto.getReduceScore().intValue() : 0;
// Integer reduceScore = shoppingCartGoodsDto.getReduceScore() != null ? shoppingCartGoodsDto.getReduceScore().intValue() : 0;
CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
.accountId("")
.name("积分扣减")
......@@ -738,15 +717,6 @@ public class OrderAdapter {
orderAccountDtos.add(createOrderAccountDto);
}
memberOrderInfo.setAccounts(orderAccountDtos);
/* List<CreateOrderProductRequest.ProductDiscount> memberProductList = new ArrayList<>();
CreateOrderProductRequest.ProductDiscount memberProduct = new CreateOrderProductRequest.ProductDiscount();
memberProduct.setQueryOrderAccountType(QueryOrderAccountType.CARD_DISCOUNT_AMOUNT);
memberProduct.setDiscountPrice(cardDiscountAmount);
List<CreateOrderProductRequest> products = new ArrayList<>();
CreateOrderProductRequest product = new CreateOrderProductRequest();
product.setDiscountList(memberProductList);
products.add(product);
memberOrderInfo.setProducts(products);*/
return memberOrderInfo;
}
......@@ -929,15 +899,6 @@ public class OrderAdapter {
responseVo.setTakeOut(0);
responseVo.setTakeOutDesc("");
}
/*
if (OrderType.COLLECT_GOODS.getCode().equals(ordersBean.getType())) {
responseVo.setTakeOut(1);
responseVo.setTakeOutDesc("打包带走");
} else {
responseVo.setTakeOut(0);
responseVo.setTakeOutDesc("店内就餐");
}
*/
responseVo.setTableNumber(ordersBean.getBarCounter());
responseVo.setPayStatus(ordersBean.getPayStatus());
responseVo.setPayStatusDesc(Optional.ofNullable(PayStatus.getByCode(ordersBean.getPayStatus()))
......@@ -1739,7 +1700,6 @@ public class OrderAdapter {
}
//优惠券满减总优惠
Long couponFull = couponDiscount + fullReduction;
// Long saleTotalAmount = originalTotalAmount - discountTotalAmount;
productVo.setOriginalTotalAmount(originalTotalAmount);
Long saleTotalAmount = productBean.getSettlementPrice() + couponFull;
productVo.setSaleTotalAmount(saleTotalAmount);
......@@ -1754,14 +1714,6 @@ public class OrderAdapter {
}
public OrderRefundRequestDto convent2OrderRefundRequestDto(OrderRefundVo orderRefundVo, String orderId) {
OrderRefundRequestDto orderRefundRequestDto = new OrderRefundRequestDto();
orderRefundRequestDto.setOrderId(orderId);
orderRefundRequestDto.setReason(orderRefundVo.getReason());
orderRefundRequestDto.setRemark(orderRefundVo.getRemarks());
return orderRefundRequestDto;
}
public com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest getOrderPayRefundRequest(QueryOrdersResponseDto.DataBean.OrderBean orderBean, Long refundId, String fatherOrderId) {
com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = new com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest();
orderPayRefundRequest.setOrgTransId(fatherOrderId);
......@@ -1779,7 +1731,6 @@ public class OrderAdapter {
public CancelOrderRequest convent2CancelOrderRequest(String orderId, String partnerId, AfterSalesType afterSalesType,
String reason, String trackingNo, String refundId) {
//Long refund_id = System.currentTimeMillis();
CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
cancelOrderRequest.setOrderId(orderId);
cancelOrderRequest.setPartnerId(partnerId);
......@@ -1817,7 +1768,6 @@ public class OrderAdapter {
orderPrintDto.setDeliveryTypeDesc("自配送");
}
orderPrintDto.setRemark(orderBean.getRemark());
// List<ProductBean> productBeans = orderBean.getProductList().stream().filter(p -> StringUtils.isEmpty(p.getParentProductId())).collect(Collectors.toList());
Integer count = orderBean.getProductList().stream().map(QueryOrdersResponseDto.DataBean.OrderBean.ProductBean::getNumber).reduce(Integer::sum).get();
orderPrintDto.setProductTotalAmount(count);
Long productAmount = orderBean.getProductList().stream().map(p -> p.getPrice() * p.getNumber()).reduce(Long::sum).get();
......@@ -1870,41 +1820,6 @@ public class OrderAdapter {
productVO.setSonProducts(comboProductVOs);
products.add(productVO);
}
// // 套餐商品map key=组装ParentProductId v=订单结构的商品信息
// Map<String, QueryOrdersResponseDto.DataBean.OrderBean.ProductBean> map = productBeans.stream().filter(productBean ->
// productBean.getProductType() != null && productBean.getProductType() == 6)
// .collect(Collectors.toMap(p -> p.getProductId() + "_" + p.getSequence(), p -> p));
// //套餐商品map key=ParentProductId v=打印的套餐商品
// Map<String, OrderPrintDto.ProductsBean> map2 = new HashMap<>();
//
// productBeans.stream().forEach((QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean) -> {
// OrderPrintDto.ProductsBean productBean1 = getProductBean(productBean);
//
// QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean2 = map.get(productBean.getParentProductId());
// //套餐子商品
// if (productBean2 != null) {
// OrderPrintDto.ProductsBean productsBean = map2.get(productBean.getParentProductId());
// List<OrderPrintDto.ProductsBean> sonProducts;
// if (productsBean != null) {
// sonProducts = productsBean.getSonProducts();
// sonProducts.add(productBean1);
// productsBean.setSonProducts(sonProducts);
// map2.put(productBean.getParentProductId(), productsBean);
// } else {
// OrderPrintDto.ProductsBean productBean3 = getProductBean(productBean2);
// sonProducts = productBean3.getSonProducts();
// sonProducts.add(productBean1);
// map2.put(productBean.getParentProductId(), productBean3);
// }
// }
// if ((StringUtils.isBlank(productBean.getParentProductId()) || "0".equals(productBean.getParentProductId()))
// && productBean.getProductType() != 6) {
// products.add(productBean1);
// }
//
// });
// products.addAll(map2.values());
return products;
}
......@@ -1933,6 +1848,7 @@ public class OrderAdapter {
productBean1.setSonProducts(new ArrayList<>());
return productBean1;
}
//申请
public void setApplyRefundDesc(OrderViewStatusDto orderViewStatusDto, QueryOrdersResponse.DataBean.OrderBean orderBean) {
orderViewStatusDto.setOrderStatus(orderBean.getStatus());
......@@ -1941,6 +1857,7 @@ public class OrderAdapter {
orderViewStatusDto.setRefundStatusText("商家会处理退款申请，请稍后");
orderViewStatusDto.setButtonContactPartner(true);
}
//同意
public void setAgreeRefundDesc(OrderViewStatusDto orderViewStatusDto, QueryOrdersResponse.DataBean.OrderBean orderBean) {
orderViewStatusDto.setOrderStatus(orderBean.getStatus());
......@@ -1980,7 +1897,6 @@ public class OrderAdapter {
createOrderProductDemoDto.setProductType(cartGoodsDetailDto.getProductType());
createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
// createOrderProductDemoDto.setIsFixedProduct(false);
createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
createOrderProductDemoDto.setHasStockProudct(cartGoodsDetailDto.isStockLimit());
createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
......@@ -2293,19 +2209,6 @@ public class OrderAdapter {
return orderPayDto;
}
/* public CancelOrderRequest convent2CancelOrderRequest(String orderId, String partnerId, AfterSalesType afterSalesType,
String reason, String trackingNo, Long refund_id) {
CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
cancelOrderRequest.setOrderId(orderId);
cancelOrderRequest.setPartnerId(partnerId);
cancelOrderRequest.setAfterSalesType(afterSalesType);
cancelOrderRequest.setReason(reason);
cancelOrderRequest.setTrackingNo(trackingNo);
if (refund_id != null) {
cancelOrderRequest.setRefundSerialNo(refund_id.toString());
}
return cancelOrderRequest;
}*/
public OrderPayResponse getOrderPayResponse(String partnerId, PaymentRequest paymentRequest, String orderId, String fmId) {
OrderPayResponse orderPayResponse = new OrderPayResponse();
......@@ -2318,47 +2221,6 @@ public class OrderAdapter {
}
/**
* 获取自定义信息
*/
// public OrderExtInfoDTO getOrderExtInfo(OrderPayResponse orderPayResponse, OrderExtInfoDTO orderExtInfoDto) {
// orderExtInfoDto.setOpenid(orderPayResponse.getOpenId());
// String prepayId = "";
// // StringUtils 依赖修改
// if (orderPayResponse.getPayOrder() != null && !StringUtils.isEmpty(orderPayResponse.getPayOrder().getPackageX())) {
// String[] prepayIds = orderPayResponse.getPayOrder().getPackageX().split("=");
// prepayId = prepayIds.length > 1 ? prepayIds[1] : "";
// }
// orderExtInfoDto.setPrepayId(prepayId);
//// orderExtInfoDto.setAppid(orderPayResponse.getWxAppid());
//// orderExtInfoDto.setServiceTime(orderEditInfo.getServiceTime());
//// orderExtInfoDto.setPushOrderTime(orderEditInfo.getPushOrderTime());
//// orderExtInfoDto.setSessionId(orderEditInfo.getSessionId());
//// orderExtInfoDto.setVersion(orderEditInfo.getVersion());
//// orderExtInfoDto.setRuleId(orderEditInfo.getRuleId());
// return orderExtInfoDto;
// }
/**
* 转换前端支付需要的信息
*
* @param orderPayResponse
* @return
*/
// public CreateOrderFlowResponse.CreateOrderResponseVo convent2CreateOrderResponseVo(OrderPayResponse orderPayResponse) {
// CreateOrderFlowResponse.CreateOrderResponseVo createOrderResponseVo = new CreateOrderFlowResponse.CreateOrderResponseVo();
// createOrderResponseVo.setOrderId(orderPayResponse.getOrderId());
// createOrderResponseVo.setWxAppid(orderPayResponse.getWxAppid());
// createOrderResponseVo.setFmId(orderPayResponse.getFmId());
// OrderPayResponse.PayOrderBean payOrderBean = orderPayResponse.getPayOrder();
// createOrderResponseVo.setTimestamp(payOrderBean == null ? "" : payOrderBean.getTimestamp());
// createOrderResponseVo.setNonceStr(payOrderBean == null ? "" : payOrderBean.getNonceStr());
// createOrderResponseVo.setPackageX(payOrderBean == null ? "" : payOrderBean.getPackageX());
// createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType());
// createOrderResponseVo.setSign(payOrderBean == null ? "" : payOrderBean.getSign());
// return createOrderResponseVo;
// }
/**
* 父子订单转换前端支付需要的信息
*
* @param orderPayResponse
......@@ -2669,45 +2531,45 @@ public class OrderAdapter {
}
public OrderTaskReq saveOrderTaskReq(String orderWarnTime, Long gmtExpect) {
OrderTaskReq orderTaskReq = new OrderTaskReq();
Date date = new Date(gmtExpect);
long timeStamp = getMinTime(orderWarnTime) * 60 * 1000;
Date warnDate = new Date(gmtExpect-timeStamp);
orderTaskReq.setTaskTime(DateUtil.convert2String(date,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
orderTaskReq.setProcessingTime(DateUtil.convert2String(warnDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
return orderTaskReq;
}
// public OrderTaskReq saveOrderTaskReq(String orderWarnTime, Long gmtExpect) {
// OrderTaskReq orderTaskReq = new OrderTaskReq();
// Date date = new Date(gmtExpect);
// long timeStamp = getMinTime(orderWarnTime) * 60 * 1000;
// Date warnDate = new Date(gmtExpect-timeStamp);
// orderTaskReq.setTaskTime(DateUtil.convert2String(date,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
// orderTaskReq.setProcessingTime(DateUtil.convert2String(warnDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
// return orderTaskReq;
// }
public Integer getMinTime(String code) {
Integer minTime = 0;
if(StringUtils.isBlank(code)){
return minTime;
}
switch (code) {
case "1":
minTime = 15;
break;
case "2":
minTime = 30;
break;
case "3":
minTime = 45;
break;
case "4":
minTime = 60;
break;
case "5":
minTime = 5;
break;
case "6":
minTime = 10;
break;
default:
minTime = 0;
}
return minTime;
}
// public Integer getMinTime(String code) {
// Integer minTime = 0;
// if(StringUtils.isBlank(code)){
// return minTime;
// }
// switch (code) {
// case "1":
// minTime = 15;
// break;
// case "2":
// minTime = 30;
// break;
// case "3":
// minTime = 45;
// break;
// case "4":
// minTime = 60;
// break;
// case "5":
// minTime = 5;
// break;
// case "6":
// minTime = 10;
// break;
// default:
// minTime = 0;
// }
// return minTime;
// }
/**
* 新老订单类型转换
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -147,8 +147,8 @@ public class OrderServiceImpl implements Orderservice {
@Autowired
private AssortmentCloudPrinterManager cloudPrinterManager;
@Autowired
private OrderCommonService orderCommonService;
// @Autowired
// private OrderCommonService orderCommonService;
@Autowired
private FMAssistantCloudPrintClient fmAssistantCloudPrintClient;
@Autowired
......@@ -173,8 +173,8 @@ public class OrderServiceImpl implements Orderservice {
private ActivityAdapter activityAdapter;
@Autowired
private CouponAdapter couponAdapter;
@Autowired
private ActivitySdkAdapter activitySdkAdapter;
// @Autowired
// private ActivitySdkAdapter activitySdkAdapter;
@Autowired
private MealCacheManager mealCacheManager;
//聚合订单服务
......@@ -212,8 +212,8 @@ public class OrderServiceImpl implements Orderservice {
private AssortmentOpenPlatformWxappAuthorizerManager wxappAuthorizerManager;
@Autowired
private PaymentNewClient paymentNewClient;
@Autowired
private MallOrderServiceImpl mallOrderService;
// @Autowired
// private MallOrderServiceImpl mallOrderService;
@Autowired
private CacheOpenPlatformPartnerWxappConfigManager cacheOpenPlatformPartnerWxappConfigManager;
@Autowired
......@@ -413,9 +413,7 @@ public class OrderServiceImpl implements Orderservice {
this.sendPaySuccessMessage(orderBean);
}
// 有云打印机 打印小票，杯贴
//GetStoreCloudPrintResponseDto storeCloudPrint;
try {
//storeCloudPrint = fmCloudPrintClient.getStoreCloudPrint(new GetStoreCloudPrintDto(partnerId, storeId));
List<AssortmentCloudPrinter> storePrinters = cloudPrinterManager.getStorePrinters(partnerId, storeId);
if (null != storePrinters && storePrinters.size() > 0) {
boolean printerStatus = false;
......@@ -753,8 +751,6 @@ public class OrderServiceImpl implements Orderservice {
});
}
// Map<String, Object> responseMap = Maps.newTreeMap();
responseMap.put("count", queryOrderResponse.getData() == null ? 0 : queryOrderResponse.getData().getCount());
responseMap.put("list", queryOrderResponseVos);
//只有有订单时才显示用户自定义取餐信息
......@@ -1043,8 +1039,6 @@ public class OrderServiceImpl implements Orderservice {
//// log.error("deleteOrder is error , deleteOrderDto :{}", deleteOrderDto);
// return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR);
// }
// 删除订单 通知活动添加商品库存
//backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.ACTIVITY.getCode(), TransTypeEnum.PRODUCT.getCode()));
// TODO: 2019/9/10 删除订单通知
backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
return ResponseUtil.success();
......@@ -1218,22 +1212,22 @@ public class OrderServiceImpl implements Orderservice {
return null;
}
public void backOrdersNotifyActivity(OrderBean orderBean, List<Integer> transType) {
LogUtil.info("backOrdersNotifyActivity", gson.toJson(orderBean), gson.toJson(transType));
if (orderBean == null) {
return;
}
// 删除订单 通知活动添加商品库存
ActivityCancelStockRequestDto activityCancelStockRequestDto = activityAdapter.convert2ActivityCancelStockRequestDto(
orderBean, transType);
try {
Header header = new Header(MQAction.INSERT.getAction(), "backOrdersNotifyActivity", orderBean.getOid(), backOrdersChangeOrderStatusConsumerQueue);
MQMessage<ActivityCancelStockRequestDto> message = new MQMessage<>(header, activityCancelStockRequestDto);
mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
} catch (Exception e) {
LogUtil.error("ActivityReverse", JSON.toJSONString(activityCancelStockRequestDto), "", e);
}
}
// public void backOrdersNotifyActivity(OrderBean orderBean, List<Integer> transType) {
// LogUtil.info("backOrdersNotifyActivity", gson.toJson(orderBean), gson.toJson(transType));
// if (orderBean == null) {
// return;
// }
// // 删除订单 通知活动添加商品库存
// ActivityCancelStockRequestDto activityCancelStockRequestDto = activityAdapter.convert2ActivityCancelStockRequestDto(
// orderBean, transType);
// try {
// Header header = new Header(MQAction.INSERT.getAction(), "backOrdersNotifyActivity", orderBean.getOid(), backOrdersChangeOrderStatusConsumerQueue);
// MQMessage<ActivityCancelStockRequestDto> message = new MQMessage<>(header, activityCancelStockRequestDto);
// mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
// } catch (Exception e) {
// LogUtil.error("ActivityReverse", JSON.toJSONString(activityCancelStockRequestDto), "", e);
// }
// }
public void backOrdersStatusChange(String oid, Integer orderStatus) {
......@@ -1290,55 +1284,6 @@ public class OrderServiceImpl implements Orderservice {
}
}
// /**
// * 用户评价
// *
// * @param requestVo
// * @return
// */
// @Override
// public BaseResponse userOrderEvaluation(AddUserOrderEvaluationRequestVo requestVo) {
// return microSupportClient.addEvaluationDetail(requestVo);
// }
//
// /**
// * 用户评价（新接口）
// *
// * @param requestVo
// * @return
// */
// @Override
// public BaseResponse userOrderEvaluationNew(AddUserOrderEvaluationNewRequestVo requestVo) {
// return microSupportClient.addEvaluationDetailNew(requestVo);
// }
//
// /**
// * 根据订单号查询对应的评价详情
// *
// * @param requestVo
// * @return
// */
// @Override
// public BaseResponse getEvaluationByOrderId(GetEvaluationDetailByOrderIdRequestVo requestVo) {
// return microSupportClient.getEvaluteDetailByOrderId(requestVo);
// }
//
// /**
// * 判断对应的订单有没有评价
// *
// * @param requestVo
// * @return
// */
// @Override
// public BaseResponse getEvaluationStatus(GetEvaluationDetailByOrderIdRequestVo requestVo) {
// return microSupportClient.getEvaluationStatus(requestVo);
// }
//
// @Override
// public BaseResponse getEvaluationStatusNew(GetEvaluationStatusNewRequestVo requestVo) {
// return microSupportClient.getEvaluationStatusNew(requestVo);
// }
@Override
public BaseResponse getRefundReason(GetRefundReasonVo getRefundReasonVo) {
AssortmentCustomerInfoVo customerInfoByObject = customerInfoManager.getCustomerInfoByObject(getRefundReasonVo.getSessionId());
......@@ -1375,7 +1320,6 @@ public class OrderServiceImpl implements Orderservice {
}
OrderBean orderBean = response.getData();
// TODO: 2019/9/9 再次校验是否可以退款 是否需要
// boolean refund = orderAdapter.buildRefundButton(orderBean, wxappId);
String document = OrderRefundConstant.COMMON_DOCUMENT;
if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getType())) {
return document;
......@@ -1433,15 +1377,6 @@ public class OrderServiceImpl implements Orderservice {
}
/**
* 获取缓存用户信息
*/
// private Map<String, Object> getUserInfoMapBySessionId(String sessionId) {
// String redisKey = "saas:user:info:sessionId:" + sessionId;
// Map<String, Object> map = redisCache.getValue(redisKey);
// return map;
// }
/**
* 支付后通知确认返回信息
*/
public String sendPaySuccessNoticeMessage() {
......@@ -1482,41 +1417,6 @@ public class OrderServiceImpl implements Orderservice {
}
/**
* 获取自定义信息
*/
// public OrderExtInfoDto getOrderExtInfo(String partnerId, String prepayId, String appid, String appsecret, String openid) {
// OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
// orderExtInfoDto.setOpenid(openid);
// orderExtInfoDto.setPrepayId(prepayId);
// orderExtInfoDto.setAppid(appid);
// orderExtInfoDto.setAppsecret(appsecret);
// String accessToken = getAccessToken(partnerId, appid);
// orderExtInfoDto.setAccessToken(accessToken);
// orderExtInfoDto.setExpireDate("");
// return orderExtInfoDto;
// }
/**
* 获取accessToken
*/
public String getAccessToken(String partnerId, String appid) {
if (StringUtils.isBlank(partnerId) || StringUtils.isBlank(appid)) {
return "";
}
String accessToken = "";
GetWxappAccessTokenDto getWxappAccessTokenDto = new GetWxappAccessTokenDto();
getWxappAccessTokenDto.setAppId(appid);
getWxappAccessTokenDto.setParentId(Long.valueOf(WxappMessageTemplateType.PAY_SUCCESS.getParentId()));
// GetWxappAccessTokenResponseDto responseDto = openPlatformClient.getAccessTokenAndTemplateId(getWxappAccessTokenDto);
// if (ResponseResult.SUCCESS.getCode().equals(responseDto.getCode()) && responseDto.getResult() != null) {
// accessToken = responseDto.getResult().getAccessToken();
// }
// LogUtil.info("getAccessToken end", gson.toJson(getWxappAccessTokenDto), gson.toJson(responseDto));
return accessToken;
}
/**
* 发送支付成功模板消息
*
* @param orderBean
......@@ -1553,24 +1453,24 @@ public class OrderServiceImpl implements Orderservice {
/**
* 异常状态退款流程
*/
public void orderRefund(OrderBean orderBean, String refundReason, String openid, String oid) {
String storeId = orderBean.getShopId();
String partnerId = orderBean.getCompanyId();
OrderRefundVo orderRefundVo = new OrderRefundVo();
orderRefundVo.setOid(orderBean.getOid());
orderRefundVo.setPartnerId(orderBean.getCompanyId());
orderRefundVo.setReason(refundReason);
//系统异常取消订单
partnerNoTakeOrder(orderRefundVo, orderBean, oid,AfterSalesType.SYSTEM_CANCEL,true);
// 发送消息到消息中心推送给pos前端
PushMessageNoticeDto pushMessageNoticeDto = messageNoticeAdapter.convent2PushMessageNoticeDto(2, partnerId, storeId,
null, null, null, null);
String messageNoticeResponse = messageNoticeClient.createMessage(pushMessageNoticeDto, LogThreadLocal.getTrackingNo());
// 退单冲正商品库存，冲正商品券，冲正活动库存
//backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.ACTIVITY.getCode(), TransTypeEnum.COUPON.getCode(), TransTypeEnum.PRODUCT.getCode()));
backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
}
// public void orderRefund(OrderBean orderBean, String refundReason, String openid, String oid) {
// String storeId = orderBean.getShopId();
// String partnerId = orderBean.getCompanyId();
// OrderRefundVo orderRefundVo = new OrderRefundVo();
// orderRefundVo.setOid(orderBean.getOid());
// orderRefundVo.setPartnerId(orderBean.getCompanyId());
// orderRefundVo.setReason(refundReason);
// //系统异常取消订单
// partnerNoTakeOrder(orderRefundVo, orderBean, oid,AfterSalesType.SYSTEM_CANCEL,true);
// // 发送消息到消息中心推送给pos前端
// PushMessageNoticeDto pushMessageNoticeDto = messageNoticeAdapter.convent2PushMessageNoticeDto(2, partnerId, storeId,
// null, null, null, null);
// String messageNoticeResponse = messageNoticeClient.createMessage(pushMessageNoticeDto, LogThreadLocal.getTrackingNo());
// // 退单冲正商品库存，冲正商品券，冲正活动库存
// //backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.ACTIVITY.getCode(), TransTypeEnum.COUPON.getCode(), TransTypeEnum.PRODUCT.getCode()));
// backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
//
// }
/**
* 获取父子订单商品第三方商品编号
......@@ -1888,7 +1788,6 @@ public class OrderServiceImpl implements Orderservice {
AfterSalesType.SYSTEM_CANCEL, "获取预支付失败", trackingNo, null);
orderCenterSdkService.orderCancel(cancelOrderRequest);
// TODO: 2019/9/10 hubowen mq推送变更
//backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.PRODUCT.getCode(),TransTypeEnum.ACTIVITY.getCode()), backOrdersNotifyActivityQueue, backOrdersNotifyActivityExchange);
backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
//svc 卡支付失败
if (StringUtils.isNotBlank(cardCode)) {
......@@ -1927,7 +1826,6 @@ public class OrderServiceImpl implements Orderservice {
request.setCode(cardCode);
request.setPartnerId(partnerId);
request.setStoreId(orderBean.getShopId());
// request.setStoreId("10086");
request.setAmount(orderBean.getAmount());
request.setTransId(transId);
request.setStationId("1");
......@@ -1964,7 +1862,6 @@ public class OrderServiceImpl implements Orderservice {
}
private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId,String appId, String payCode) {
// String wxAppId = userLoginInfoDto.getWxAppId();
//设置支付信息
PaymentRequest paymentRequest = new PaymentRequest();
paymentRequest.setOpenId(openId);
......@@ -2037,47 +1934,35 @@ public class OrderServiceImpl implements Orderservice {
}
/**
* 获取桌号
*/
// public String getTableNumber(String partnerId, String shopId, String tableNumber) {
// StoreTableNumber storeTableNumber = storeTableNumberManager.selectOne(partnerId, shopId, tableNumber);
// if (storeTableNumber == null) {
// return "";
// }
// return tableNumber;
// }
/**
* 冲正商品库存，活动库存,商品库存，订单取消，退款
*
* @param orderBean 订单信息
* @param transType TransTypeEnum 冲正类型
*/
public void backOrdersNotifyActivity(QueryOrdersResponse.DataBean.OrderBean orderBean, List<Integer> transType, String backOrdersNotifyActivityQueue,
String backOrdersNotifyActivityExchange) {
LogUtil.info("backOrdersNotifyActivity", JSONObject.toJSONString(transType), null);
if (orderBean == null) {
return;
}
// 删除订单 通知活动添加商品库存
ActivityCancelStockRequest activityCancelStockRequestDto = activitySdkAdapter.convert2ActivityCancelStockRequestDto(
orderBean, transType);
try {
Header header = new Header(MQAction.INSERT.getAction(), "backOrdersNotifyActivity", orderBean.getOid(), backOrdersNotifyActivityQueue);
MQMessage<ActivityCancelStockRequest> message = new MQMessage<>(header, activityCancelStockRequestDto);
mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersNotifyActivityQueue, message);
} catch (Exception e) {
//TODO 邮件告警
LogUtil.error("backOrdersNotifyActivity_error", backOrdersNotifyActivityExchange, backOrdersNotifyActivityQueue, e);
}
}
// public void backOrdersNotifyActivity(QueryOrdersResponse.DataBean.OrderBean orderBean, List<Integer> transType, String backOrdersNotifyActivityQueue,
// String backOrdersNotifyActivityExchange) {
// LogUtil.info("backOrdersNotifyActivity", JSONObject.toJSONString(transType), null);
// if (orderBean == null) {
// return;
// }
// // 删除订单 通知活动添加商品库存
// ActivityCancelStockRequest activityCancelStockRequestDto = activitySdkAdapter.convert2ActivityCancelStockRequestDto(
// orderBean, transType);
// try {
// Header header = new Header(MQAction.INSERT.getAction(), "backOrdersNotifyActivity", orderBean.getOid(), backOrdersNotifyActivityQueue);
// MQMessage<ActivityCancelStockRequest> message = new MQMessage<>(header, activityCancelStockRequestDto);
// mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersNotifyActivityQueue, message);
// } catch (Exception e) {
// //TODO 邮件告警
// LogUtil.error("backOrdersNotifyActivity_error", backOrdersNotifyActivityExchange, backOrdersNotifyActivityQueue, e);
// }
// }
/**
* 编辑订单，保持预支付信息
*/
public BaseResponse updateOrderInfo(OrderPayResponse orderPayResponse, OrderExtInfoDto orderExtInfo
, QueryOrdersResponse.DataBean.OrderBean orderBean, String trackingNo) {
// orderExtInfo = orderAdapter.getOrderExtInfo(orderPayResponse, orderExtInfo);
orderExtInfo.setOpenid(orderPayResponse.getOpenId());
orderExtInfo.setFmId(orderPayResponse.getFmId());
orderExtInfo.setAppid(orderPayResponse.getWxAppid());
......@@ -2104,7 +1989,6 @@ public class OrderServiceImpl implements Orderservice {
AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null);
orderCenterSdkService.orderCancel(cancelOrderRequest);
//如果编辑订单支付信息失败，冲正
// backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.PRODUCT.getCode(),TransTypeEnum.ACTIVITY.getCode()), backOrdersNotifyActivityQueue, backOrdersNotifyActivityExchange);
backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
return ResponseUtil.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg());
......@@ -2186,9 +2070,7 @@ public class OrderServiceImpl implements Orderservice {
*/
private void printApplyRefundSmallTicket(OrderBean orderBean, OrderRefundVo orderRefundVo) {
// 有云打印机 打印小票，杯贴
//GetStoreCloudPrintResponseDto storeCloudPrint;
try {
//storeCloudPrint = fmCloudPrintClient.getStoreCloudPrint(new GetStoreCloudPrintDto(orderBean.getCompanyId(), orderBean.getShopId()));
List<AssortmentCloudPrinter> storePrinters = cloudPrinterManager.getStorePrinters(orderBean.getCompanyId(), orderBean.getShopId());
if (null != storePrinters && storePrinters.size() > 0) {
boolean printerStatus = false;
......@@ -2384,7 +2266,6 @@ public class OrderServiceImpl implements Orderservice {
* 扫脸支付
*/
public OrderPayResponse facePay(String cardCode, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo) {
// CodePayRequest request = new CodePayRequest();
FacePayRequestDto request = new FacePayRequestDto();
String partnerId = orderBean.getCompanyId();
request.setBody(orderBean.getShopName());
......
order-application-service/src/test/java/cn.freemud/service/OrderServiceTest.java
......@@ -160,10 +160,10 @@ public class OrderServiceTest {
}
@Test
public void getAccessToken() {
orderService.getAccessToken("1779", "wx2eba2ce69704a6c7");
}
// @Test
// public void getAccessToken() {
// orderService.getAccessToken("1779", "wx2eba2ce69704a6c7");
// }
@Test
......
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