Skip to content

O
order-group
Commit 5c1c9a7c by ping.wu
Options

Merge branches 'develop' and 'feature/20191216_记录订单操作人_wuping' of… 

Merge branches 'develop' and 'feature/20191216_记录订单操作人_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
parents 5ae214fc 9bd72fce
Showing with 190 additions and 107 deletions
.gitignore
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
.gitignore .gitignore
.idea/ .idea/
assortment-ordercenter-sdk/assortment-ordercenter-sdk.iml assortment-ordercenter-sdk/assortment-ordercenter-sdk.iml
assortment-ordercenter-sdk/readme.md
assortment-ordercenter-sdk/target/ assortment-ordercenter-sdk/target/
assortment-shoppingcart-sdk/assortment-shoppingcart-sdk.iml
assortment-shoppingcart-sdk/target/
call-back-service/call-back-service.iml call-back-service/call-back-service.iml
call-back-service/target/ call-back-service/target/
order-application-service/order-application-service.iml order-application-service/order-application-service.iml
......
assortment-ordercenter-sdk/pom.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.0.0</version> <version>1.0.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<version>1.0.0</version> <version>1.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
...@@ -52,6 +52,7 @@ public class OrderSdkAdapter { ...@@ -52,6 +52,7 @@ public class OrderSdkAdapter {
cancelOrderRequest.setAfterSalesType(afterSalesType); cancelOrderRequest.setAfterSalesType(afterSalesType);
cancelOrderRequest.setReason(reason); cancelOrderRequest.setReason(reason);
cancelOrderRequest.setTrackingNo(trackingNo); cancelOrderRequest.setTrackingNo(trackingNo);
cancelOrderRequest.setOperator("admin");
if (refund_id != null) { if (refund_id != null) {
cancelOrderRequest.setRefundSerialNo(refund_id.toString()); cancelOrderRequest.setRefundSerialNo(refund_id.toString());
} }
...@@ -139,6 +140,7 @@ public class OrderSdkAdapter { ...@@ -139,6 +140,7 @@ public class OrderSdkAdapter {
//保存门店渠道信息 //保存门店渠道信息
request.setOrderExtended(requestVO.getOrderExtended()); request.setOrderExtended(requestVO.getOrderExtended());
request.setOrderTask(requestVO.getOrderTask()); request.setOrderTask(requestVO.getOrderTask());
request.setOperator(requestVO.getOperator());
//订单重量 //订单重量
Double orderWeight = sumOrderWeight(requestVO.getProducts()); Double orderWeight = sumOrderWeight(requestVO.getProducts());
...@@ -156,6 +158,7 @@ public class OrderSdkAdapter { ...@@ -156,6 +158,7 @@ public class OrderSdkAdapter {
} }
createFatherSonOrderReq.setOrders(orderList); createFatherSonOrderReq.setOrders(orderList);
createFatherSonOrderReq.setParentOrder(convertOrderInfo2CreateOrderRequest(request.getParentOrder())); createFatherSonOrderReq.setParentOrder(convertOrderInfo2CreateOrderRequest(request.getParentOrder()));
createFatherSonOrderReq.setOperator(request.getOperator());
return createFatherSonOrderReq; return createFatherSonOrderReq;
} }
...@@ -2073,6 +2076,7 @@ public class OrderSdkAdapter { ...@@ -2073,6 +2076,7 @@ public class OrderSdkAdapter {
result.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode()); result.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode());
result.setOrderCode(request.getOrderCode()); result.setOrderCode(request.getOrderCode());
result.setPartnerId(request.getPartnerId()); result.setPartnerId(request.getPartnerId());
result.setOperator(request.getOperator());
return result; return result;
} }
...@@ -2098,7 +2102,8 @@ public class OrderSdkAdapter { ...@@ -2098,7 +2102,8 @@ public class OrderSdkAdapter {
request.setExtInfo(requestVO.getExtInfo()); request.setExtInfo(requestVO.getExtInfo());
request.setBarCounter(requestVO.getBarCounter()); request.setBarCounter(requestVO.getBarCounter());
request.setDinersNumber(requestVO.getDinersNumber()); request.setDinersNumber(requestVO.getDinersNumber());
DecimalFormat decimalFormat = new DecimalFormat("#0.00"); request.setOperator(requestVO.getOperator());
// DecimalFormat decimalFormat = new DecimalFormat("#0.00");
//商品信息转换 //商品信息转换
List<OrderItemCreateReq> orderItemList = new ArrayList<>(); List<OrderItemCreateReq> orderItemList = new ArrayList<>();
//优惠信息转换 //优惠信息转换
...@@ -2168,6 +2173,7 @@ public class OrderSdkAdapter { ...@@ -2168,6 +2173,7 @@ public class OrderSdkAdapter {
deliveryContactInfoCreateReq.setContactsName(requestVO.getUserName()); deliveryContactInfoCreateReq.setContactsName(requestVO.getUserName());
deliveryContactInfoList.add(deliveryContactInfoCreateReq); deliveryContactInfoList.add(deliveryContactInfoCreateReq);
request.setDeliveryContactInfoList(deliveryContactInfoList); request.setDeliveryContactInfoList(deliveryContactInfoList);
request.setOperator(requestVO.getOperator());
return request; return request;
} }
...@@ -2235,6 +2241,7 @@ public class OrderSdkAdapter { ...@@ -2235,6 +2241,7 @@ public class OrderSdkAdapter {
} }
//商品信息赋值 //商品信息赋值
request.setOrderItemList(orderItemList); request.setOrderItemList(orderItemList);
request.setOperator(requestVO.getOperator());
return request; return request;
} }
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupCreateOrderRequest.java
...@@ -97,4 +97,7 @@ public class AssortmentGroupCreateOrderRequest extends BaseConfig { ...@@ -97,4 +97,7 @@ public class AssortmentGroupCreateOrderRequest extends BaseConfig {
*/ */
private List<CreateOrderProductRequest> products; private List<CreateOrderProductRequest> products;
//操作人
private String operator;
} }
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupOrderAffirmRequest.java
...@@ -147,5 +147,7 @@ public class AssortmentGroupOrderAffirmRequest extends BaseConfig { ...@@ -147,5 +147,7 @@ public class AssortmentGroupOrderAffirmRequest extends BaseConfig {
* 手机号 * 手机号
*/ */
private String mobile; private String mobile;
//操作人
private String operator;
} }
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupOrderClearRequest.java
...@@ -35,4 +35,6 @@ public class AssortmentGroupOrderClearRequest extends BaseConfig { ...@@ -35,4 +35,6 @@ public class AssortmentGroupOrderClearRequest extends BaseConfig {
* 三方订单号 * 三方订单号
*/ */
private String thirdOrderCode; private String thirdOrderCode;
//操作人
private String operator;
} }
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupUpdateOrderRequest.java
...@@ -56,4 +56,7 @@ public class AssortmentGroupUpdateOrderRequest extends AssortmentGroupCreateOrde ...@@ -56,4 +56,7 @@ public class AssortmentGroupUpdateOrderRequest extends AssortmentGroupCreateOrde
*/ */
private List<CreateOrderAccountRequest> accounts; private List<CreateOrderAccountRequest> accounts;
//操作人
private String operator;
} }
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentSdkUpdateOrderProductInfoRequest.java
...@@ -81,4 +81,7 @@ public class AssortmentSdkUpdateOrderProductInfoRequest extends BaseConfig { ...@@ -81,4 +81,7 @@ public class AssortmentSdkUpdateOrderProductInfoRequest extends BaseConfig {
deleteAndUpdate,update,updateByOrderProductDetailId,updatePrePayPrice,deleteOrderProduct deleteAndUpdate,update,updateByOrderProductDetailId,updatePrePayPrice,deleteOrderProduct
} }
private List<CreateOrderProductRequest> orderItemList; private List<CreateOrderProductRequest> orderItemList;
//操作人
private String operator;
} }
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentUpdateDeliveryAbnormalRequest.java
...@@ -34,4 +34,8 @@ public class AssortmentUpdateDeliveryAbnormalRequest { ...@@ -34,4 +34,8 @@ public class AssortmentUpdateDeliveryAbnormalRequest {
* 第三方运单号 * 第三方运单号
*/ */
private String deliveryId; private String deliveryId;
//操作人
private String operator;
} }
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
...@@ -125,6 +125,8 @@ public class BaseCreateOrderRequest extends BaseConfig { ...@@ -125,6 +125,8 @@ public class BaseCreateOrderRequest extends BaseConfig {
//预订单任务 //预订单任务
private OrderTaskReq orderTask; private OrderTaskReq orderTask;
//操作人
private String operator;
/** /**
* 促销活动扣减库存 * 促销活动扣减库存
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseQueryOrderRequest.java
...@@ -53,7 +53,7 @@ public class BaseQueryOrderRequest extends BaseConfig { ...@@ -53,7 +53,7 @@ public class BaseQueryOrderRequest extends BaseConfig {
*/ */
private Integer withOperationHistory; private Integer withOperationHistory;
//预约单与当前时间间隔（分钟） //操作人
private Integer intervalTime; private String operator;
} }
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java
...@@ -58,4 +58,7 @@ public class CancelOrderRequest extends BaseConfig { ...@@ -58,4 +58,7 @@ public class CancelOrderRequest extends BaseConfig {
*/ */
private Integer createEvent; private Integer createEvent;
private Integer orderClient= OrderClientType.SAAS.getIndex(); private Integer orderClient= OrderClientType.SAAS.getIndex();
//操作人
private String operator;
} }
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ClearTableRequest.java
...@@ -43,6 +43,9 @@ public class ClearTableRequest extends BaseConfig { ...@@ -43,6 +43,9 @@ public class ClearTableRequest extends BaseConfig {
private OpClearTableEnum opClearTableEnum; private OpClearTableEnum opClearTableEnum;
//操作人
private String operator;
/** /**
* closeOrder 关闭订单 * closeOrder 关闭订单
* noOperationOrder 不操作订单 * noOperationOrder 不操作订单
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java
...@@ -24,6 +24,12 @@ public class ConfirmOrderRequest extends BaseConfig { ...@@ -24,6 +24,12 @@ public class ConfirmOrderRequest extends BaseConfig {
private Integer timeout; private Integer timeout;
//实际支付金额 //实际支付金额
private String actualPayAmount; private String actualPayAmount;
/**
* 自定义字段
*/
private String extInfo;
//操作人
private String operator;
private List<OrderSettlement>orderSettlements; private List<OrderSettlement>orderSettlements;
@Data @Data
public static class OrderSettlement{ public static class OrderSettlement{
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateFatherSonOrderRequest.java
...@@ -26,6 +26,8 @@ public class CreateFatherSonOrderRequest extends BaseConfig { ...@@ -26,6 +26,8 @@ public class CreateFatherSonOrderRequest extends BaseConfig {
private OrderInfo parentOrder; private OrderInfo parentOrder;
private List<OrderInfo> orderInfoList; private List<OrderInfo> orderInfoList;
private String partnerId; private String partnerId;
//操作人
private String operator;
/** /**
* 消息Queue信息 * 消息Queue信息
*/ */
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderRequest.java
...@@ -11,10 +11,6 @@ public class CreateOrderRequest extends BaseConfig { ...@@ -11,10 +11,6 @@ public class CreateOrderRequest extends BaseConfig {
*/ */
BaseCreateOrderRequest baseCreateOrderRequest; BaseCreateOrderRequest baseCreateOrderRequest;
/** /**
* 支付信息
*/
// PaymentRequest paymentRequest;
/**
* 消息Queue信息 * 消息Queue信息
*/ */
MqMessageRequest mqMessageRequest; MqMessageRequest mqMessageRequest;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/DeleteOrderRequest.java
...@@ -7,4 +7,7 @@ import lombok.Data; ...@@ -7,4 +7,7 @@ import lombok.Data;
public class DeleteOrderRequest extends BaseConfig { public class DeleteOrderRequest extends BaseConfig {
private String orderId; private String orderId;
//操作人
private String operator;
} }
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderRefundRequest.java
...@@ -30,4 +30,7 @@ public class OrderRefundRequest extends BaseConfig { ...@@ -30,4 +30,7 @@ public class OrderRefundRequest extends BaseConfig {
private String remark; private String remark;
private String storeId; private String storeId;
//操作人
private String operator;
} }
order-application-service/pom.xml
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.0.0</version> <version>1.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -500,6 +500,7 @@ public class OrderAdapter { ...@@ -500,6 +500,7 @@ public class OrderAdapter {
createOrderDto.setAddInfo(deliveryTypeInfo); createOrderDto.setAddInfo(deliveryTypeInfo);
createOrderDto.setAmount(0L); createOrderDto.setAmount(0L);
createOrderDto.setBarCounter(createOrderVo.getTableNumber()); createOrderDto.setBarCounter(createOrderVo.getTableNumber());
createOrderDto.setOperator(createOrderVo.getUserName());
return createOrderDto; return createOrderDto;
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -344,6 +344,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -344,6 +344,7 @@ public class OrderServiceImpl implements Orderservice {
var1.setPartnerId(partnerId); var1.setPartnerId(partnerId);
var1.setStoreId(storeId); var1.setStoreId(storeId);
var1.setOrderType(orderBean.getType()); var1.setOrderType(orderBean.getType());
var1.setOperator(orderBean.getUserName());
// 订单支付成功 // 订单支付成功
com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1); com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
...@@ -599,6 +600,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -599,6 +600,7 @@ public class OrderServiceImpl implements Orderservice {
request.setOrderId(requestVo.getTransId()); request.setOrderId(requestVo.getTransId());
request.setAfterSalesCode(afterSalesCode); request.setAfterSalesCode(afterSalesCode);
request.setRefundSerialNo(requestVo.getRefundId()); request.setRefundSerialNo(requestVo.getRefundId());
request.setOperator("admin");
request.setTrackingNo(trackingNo); request.setTrackingNo(trackingNo);
BaseOrderResponse response = orderCenterSdkService.orderRefundComplete(request); BaseOrderResponse response = orderCenterSdkService.orderRefundComplete(request);
if (response == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, response.getErrcode())) { if (response == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, response.getErrcode())) {
...@@ -1140,6 +1142,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1140,6 +1142,7 @@ public class OrderServiceImpl implements Orderservice {
var1.setPartnerId(orderRefundVo.getPartnerId()); var1.setPartnerId(orderRefundVo.getPartnerId());
var1.setStoreId(orderBean.getShopId()); var1.setStoreId(orderBean.getShopId());
var1.setOrderStatus(orderBean.getStatus()); var1.setOrderStatus(orderBean.getStatus());
var1.setOperator(orderBean.getUserName());
BaseOrderResponse baseResponseDto = orderCenterSdkService.orderRefund(var1); BaseOrderResponse baseResponseDto = orderCenterSdkService.orderRefund(var1);
if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) { if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), baseResponseDto.getErrmsg()); return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), baseResponseDto.getErrmsg());
...@@ -1186,6 +1189,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1186,6 +1189,7 @@ public class OrderServiceImpl implements Orderservice {
cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent()); cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent());
} }
cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks()); cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
cancelOrderRequest.setOperator(orderBean.getUserName());
BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest); BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) { if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed"); return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
...@@ -1535,6 +1539,8 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1535,6 +1539,8 @@ public class OrderServiceImpl implements Orderservice {
orderRefundVo.setOid(orderBean.getOid()); orderRefundVo.setOid(orderBean.getOid());
orderRefundVo.setPartnerId(orderBean.getCompanyId()); orderRefundVo.setPartnerId(orderBean.getCompanyId());
orderRefundVo.setReason(refundReason); orderRefundVo.setReason(refundReason);
//系统异常取消订单
orderBean.setUserName("admin");
partnerNoTakeOrder(orderRefundVo, orderBean, oid); partnerNoTakeOrder(orderRefundVo, orderBean, oid);
// 发送消息到消息中心推送给pos前端 // 发送消息到消息中心推送给pos前端
PushMessageNoticeDto pushMessageNoticeDto = messageNoticeAdapter.convent2PushMessageNoticeDto(2, partnerId, storeId, PushMessageNoticeDto pushMessageNoticeDto = messageNoticeAdapter.convent2PushMessageNoticeDto(2, partnerId, storeId,
......
ordercenter-sdk/pom.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.0.0</version> <version>1.0.0-SNAPSHOT</version>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<dependencies> <dependencies>
......
ordercenter-sdk/readme.md
...@@ -58,4 +58,5 @@ ...@@ -58,4 +58,5 @@
| 2.7.2.RELEASE | 基础2.6.4版本升级release| 伍平 | 2019-10-24 | | 2.7.2.RELEASE | 基础2.6.4版本升级release| 伍平 | 2019-10-24 |
| 2.6.5-SNAPSHOT |增加 订单业务类型，会员使用| 伍平 | 2019-10-24 | | 2.6.5-SNAPSHOT |增加 订单业务类型，会员使用| 伍平 | 2019-10-24 |
| 2.7.3.RELEASE | 基于2.7.2.RELEASE升级| 丁凯 | 2019-10-24 | | 2.7.3.RELEASE | 基于2.7.2.RELEASE升级| 丁凯 | 2019-10-24 |
| 2.7.4.RELEASE | 2.6.5-SNAPSHOT升级RELEASE| 伍平 | 2019-11-07 | | 2.7.4.RELEASE | 2.6.5-SNAPSHOT升级RELEASE| 伍平 | 2019-11-07 |
\ No newline at end of file | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
\ No newline at end of file
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java
package com.freemud.application.sdk.api.ordercenter.adapter; //package com.freemud.application.sdk.api.ordercenter.adapter;
//
import com.freemud.application.sdk.api.ordercenter.response.OrderDownloadResp; //import com.freemud.application.sdk.api.ordercenter.response.OrderDownloadResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*; //import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.List; //import java.util.List;
//
@Component //@Component
public class OrderCenterSdkAdapter { //public class OrderCenterSdkAdapter {
//
public List<OrderDownloadResp> convent2OrderDownloads(List<OrderInfoReqs> orderDtos) { // public List<OrderDownloadResp> convent2OrderDownloads(List<OrderInfoReqs> orderDtos) {
List<OrderDownloadResp> downloads = new ArrayList<>(); // List<OrderDownloadResp> downloads = new ArrayList<>();
orderDtos.forEach(orderDto -> { // orderDtos.forEach(orderDto -> {
OrderDownloadResp download = new OrderDownloadResp(); // OrderDownloadResp download = new OrderDownloadResp();
download.setOid(orderDto.getOrderCode()); // download.setOid(orderDto.getOrderCode());
download.setShopId(orderDto.getStoreId()); // download.setShopId(orderDto.getStoreId());
download.setShopName(orderDto.getStoreName()); // download.setShopName(orderDto.getStoreName());
download.setUserName(orderDto.getUserName()); // download.setUserName(orderDto.getUserName());
download.setSource("saas"); // download.setSource("saas");
download.setSource("i点餐"); // download.setSource("i点餐");
download.setType(orderDto.getOrderType().intValue()); // download.setType(orderDto.getOrderType().intValue());
download.setTypeStr(""); // download.setTypeStr("");
download.setStatus(orderDto.getOrderState().intValue()); // download.setStatus(orderDto.getOrderState().intValue());
// download.setStatusStr(OrderStatus.getByIndex(orderDto.getOrderState()).getName()); //// download.setStatusStr(OrderStatus.getByIndex(orderDto.getOrderState()).getName());
download.setOrderAmount(orderDto.getOriginalAmount().intValue()); // download.setOrderAmount(orderDto.getOriginalAmount().intValue());
download.setOrderAmountYuan(new Double(orderDto.getOriginalAmount().doubleValue() / 100)); // download.setOrderAmountYuan(new Double(orderDto.getOriginalAmount().doubleValue() / 100));
download.setAmount(orderDto.getActualPayAmount().intValue()); // download.setAmount(orderDto.getActualPayAmount().intValue());
download.setAmountYuan(orderDto.getActualPayAmount().doubleValue() / 100); // download.setAmountYuan(orderDto.getActualPayAmount().doubleValue() / 100);
//
Integer productAmount = 0; // Integer productAmount = 0;
for (OrderItemResp orderItemDto : orderDto.getOrderItemList()) { // for (OrderItemResp orderItemDto : orderDto.getOrderItemList()) {
download.setProductId(orderItemDto.getProductId()); // download.setProductId(orderItemDto.getProductId());
download.setProductName(orderItemDto.getProductName()); // download.setProductName(orderItemDto.getProductName());
download.setProductPrice(orderItemDto.getProductPrice().intValue()); // download.setProductPrice(orderItemDto.getProductPrice().intValue());
download.setProductPriceYuan(orderItemDto.getProductPrice().doubleValue() / 100); // download.setProductPriceYuan(orderItemDto.getProductPrice().doubleValue() / 100);
// download.setProductDiscountAmountYuan(orderItemDto.getProductPrice().subtract(orderItemDto.getSalePrice()).doubleValue()/100); //// download.setProductDiscountAmountYuan(orderItemDto.getProductPrice().subtract(orderItemDto.getSalePrice()).doubleValue()/100);
productAmount += orderItemDto.getProductPrice().intValue() * orderItemDto.getProductQuantity(); // productAmount += orderItemDto.getProductPrice().intValue() * orderItemDto.getProductQuantity();
} // }
download.setProductAmount(productAmount); // download.setProductAmount(productAmount);
download.setProductAmountYuan(productAmount.doubleValue() / 100); // download.setProductAmountYuan(productAmount.doubleValue() / 100);
//
for (OrderCostResp detail : orderDto.getOrderCostDetailList()) { // for (OrderCostResp detail : orderDto.getOrderCostDetailList()) {
// if(detail.getCostType() .equals(OrderCostType.PACKING_CHARGES.getIndex())) { //// if(detail.getCostType() .equals(OrderCostType.PACKING_CHARGES.getIndex())) {
// download.setPackageFee(detail.getCostAmount().intValue()); //// download.setPackageFee(detail.getCostAmount().intValue());
// download.setPackageFeeYuan(detail.getCostAmount().doubleValue()/100); //// download.setPackageFeeYuan(detail.getCostAmount().doubleValue()/100);
// } //// }
//
// if(detail.getCostType().equals(OrderCostType.CARRIAGE.getIndex())){ //// if(detail.getCostType().equals(OrderCostType.CARRIAGE.getIndex())){
// download.setDeliveryFee(detail.getCostAmount().intValue()); //// download.setDeliveryFee(detail.getCostAmount().intValue());
// download.setDeliveryFeeYuan(detail.getCostAmount().doubleValue()/100); //// download.setDeliveryFeeYuan(detail.getCostAmount().doubleValue()/100);
// } //// }
} // }
//
Integer activyPrice = 0; // Integer activyPrice = 0;
String activeItem = ""; // String activeItem = "";
for (OrderSettlementResp dto : orderDto.getOrderSettlementDetailList()) { // for (OrderSettlementResp dto : orderDto.getOrderSettlementDetailList()) {
activyPrice += dto.getSettlementAmount().intValue(); // activyPrice += dto.getSettlementAmount().intValue();
// activeItem += OrderSettlementType.getByIndex(dto.getSettlementType()).getName(); //// activeItem += OrderSettlementType.getByIndex(dto.getSettlementType()).getName();
} // }
download.setAcitviyCost(activyPrice); // download.setAcitviyCost(activyPrice);
download.setAcitviyCostYuan(activyPrice.doubleValue() / 100); // download.setAcitviyCostYuan(activyPrice.doubleValue() / 100);
download.setAcivityItems(activeItem); // download.setAcivityItems(activeItem);
//
// download.setGmtCreate(orderDto.getCreateTime()); //// download.setGmtCreate(orderDto.getCreateTime());
// download.setGmtPay(orderDto.getPayTime()); //// download.setGmtPay(orderDto.getPayTime());
//
download.setPayNo(orderDto.getPayRequestNo()); // download.setPayNo(orderDto.getPayRequestNo());
// download.setPayStatus(PayStatus.getByIndex(orderDto.getPayState()).getName()); //// download.setPayStatus(PayStatus.getByIndex(orderDto.getPayState()).getName());
//
for (DeliveryContactInfoResp info : orderDto.getDeliveryContactInfoList()) { // for (DeliveryContactInfoResp info : orderDto.getDeliveryContactInfoList()) {
// if(RelateObjectType.ORDER_ADDRESS.equals(info.getRelateObjectType())){ //// if(RelateObjectType.ORDER_ADDRESS.equals(info.getRelateObjectType())){
// download.setPhone(info.getMobile()); //// download.setPhone(info.getMobile());
// download.setAddress(info.getAddressDetail()); //// download.setAddress(info.getAddressDetail());
// } //// }
//
// if (RelateObjectType.COURIER.equals(info.getRelateObjectType())){ //// if (RelateObjectType.COURIER.equals(info.getRelateObjectType())){
// download.setRiderName(info.getContactsName()); //// download.setRiderName(info.getContactsName());
// download.setRiderPhone(info.getMobile()); //// download.setRiderPhone(info.getMobile());
// } //// }
} // }
//
download.setExpress(orderDto.getExpressChannelName()); // download.setExpress(orderDto.getExpressChannelName());
download.setDeliveryId(orderDto.getExpressNo()); // download.setDeliveryId(orderDto.getExpressNo());
downloads.add(download); // downloads.add(download);
}); // });
return downloads; // return downloads;
} // }
} //}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/AfterSalesOperateReq.java
...@@ -37,4 +37,7 @@ public class AfterSalesOperateReq { ...@@ -37,4 +37,7 @@ public class AfterSalesOperateReq {
//同意审核原因 //同意审核原因
private String adultRemark; private String adultRemark;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupCreateOrderRequest.java
...@@ -74,4 +74,7 @@ public class GroupCreateOrderRequest { ...@@ -74,4 +74,7 @@ public class GroupCreateOrderRequest {
//订单商信息 //订单商信息
List<OrderItemCreateReq> orderItemList; List<OrderItemCreateReq> orderItemList;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupDiningCloseReq.java
...@@ -34,4 +34,7 @@ public class GroupDiningCloseReq { ...@@ -34,4 +34,7 @@ public class GroupDiningCloseReq {
*/ */
private Integer orderClient; private Integer orderClient;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupOrderAffirmReq.java
...@@ -102,5 +102,7 @@ public class GroupOrderAffirmReq { ...@@ -102,5 +102,7 @@ public class GroupOrderAffirmReq {
//配送联系人信息 //配送联系人信息
List<DeliveryContactInfoCreateReq> deliveryContactInfoList; List<DeliveryContactInfoCreateReq> deliveryContactInfoList;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupOrderClearReq.java
...@@ -36,4 +36,7 @@ public class GroupOrderClearReq { ...@@ -36,4 +36,7 @@ public class GroupOrderClearReq {
*/ */
private String thirdOrderCode; private String thirdOrderCode;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupOrderUpdateReq.java
...@@ -87,4 +87,7 @@ public class GroupOrderUpdateReq { ...@@ -87,4 +87,7 @@ public class GroupOrderUpdateReq {
//订单商品信息 //订单商品信息
List<OrderItemCreateReq> orderItemList; List<OrderItemCreateReq> orderItemList;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
...@@ -40,7 +40,6 @@ public class OrderCancelReq { ...@@ -40,7 +40,6 @@ public class OrderCancelReq {
*/ */
private String afterSalesReason; private String afterSalesReason;
/** /**
*
* 用户自身描述的取消原因 * 用户自身描述的取消原因
*/ */
private String reqRemark; private String reqRemark;
...@@ -57,4 +56,7 @@ public class OrderCancelReq { ...@@ -57,4 +56,7 @@ public class OrderCancelReq {
* 退款流水号 * 退款流水号
*/ */
private String afterSerialNo; private String afterSerialNo;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderChangeStateReq.java
...@@ -19,4 +19,6 @@ public class OrderChangeStateReq { ...@@ -19,4 +19,6 @@ public class OrderChangeStateReq {
private String orderCode; private String orderCode;
private Integer orderState; private Integer orderState;
private String remark; private String remark;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderDeleteReq.java
...@@ -19,4 +19,7 @@ public class OrderDeleteReq { ...@@ -19,4 +19,7 @@ public class OrderDeleteReq {
private String orderCode; private String orderCode;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/PaySuccessReq.java
...@@ -45,4 +45,7 @@ public class PaySuccessReq { ...@@ -45,4 +45,7 @@ public class PaySuccessReq {
//扩展字段 //扩展字段
private String extInfo; private String extInfo;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/SdkUpdateAbnormalState.java
...@@ -43,4 +43,8 @@ public class SdkUpdateAbnormalState { ...@@ -43,4 +43,8 @@ public class SdkUpdateAbnormalState {
* 第三方订单号 * 第三方订单号
*/ */
private String thirdOrderCode; private String thirdOrderCode;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
...@@ -208,4 +208,7 @@ public class CreateOrderRequest extends BaseRequest { ...@@ -208,4 +208,7 @@ public class CreateOrderRequest extends BaseRequest {
//预订单任务 //预订单任务
private OrderTaskReq orderTask; private OrderTaskReq orderTask;
//操作人
private String operator;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
...@@ -46,8 +46,6 @@ public class OrderSdkService { ...@@ -46,8 +46,6 @@ public class OrderSdkService {
private RestTemplate restTemplate; private RestTemplate restTemplate;
@Autowired @Autowired
private OrderCenterProperties orderCenterProperties; private OrderCenterProperties orderCenterProperties;
// @Autowired
// private OrderCenterSdkAdapter orderCenterSdkAdapter;
public static final String SUCCESS_RESPONSE_CODE = "100"; public static final String SUCCESS_RESPONSE_CODE = "100";
......
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