Skip to content

O
order-group
Commit 1dbdb924 by 张洪旺
Options

Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into develop 

# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
parents a7b9e3bc c5869901
Showing with 238 additions and 103 deletions
order-application-service/pom.xml
...@@ -41,6 +41,18 @@ ...@@ -41,6 +41,18 @@
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>2.0.16-SNAPSHOT</version> <version>2.0.16-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>ordercenter-sdk</artifactId>
<groupId>cn.freemud</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<artifactId>ordercenter-sdk</artifactId>
<groupId>cn.freemud</groupId>
<version>1.3.22.RELEASE</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/enums/ResponseResult.java
...@@ -159,6 +159,7 @@ public enum ResponseResult { ...@@ -159,6 +159,7 @@ public enum ResponseResult {
ORDER_DELIVERY_CALL_BACK_FAILED("45083", "配送回调失败，为找到对应操作类型"), ORDER_DELIVERY_CALL_BACK_FAILED("45083", "配送回调失败，为找到对应操作类型"),
ORDER_TAKE_OUT_ADDRESS_NOT_VALID("45063", "收货地址校验失败"), ORDER_TAKE_OUT_ADDRESS_NOT_VALID("45063", "收货地址校验失败"),
ORDER_COLLECT_FAILED("45084", "推送入机失败,配送回调失败"), ORDER_COLLECT_FAILED("45084", "推送入机失败,配送回调失败"),
ORDER_NO_PAU("45063", "订单未支付"),
/** /**
* 支付 * 支付
*/ */
......
order-application-service/src/main/java/cn/freemud/fuyou/controller/FuYouOrderController.java
...@@ -3,6 +3,7 @@ package cn.freemud.fuyou.controller; ...@@ -3,6 +3,7 @@ package cn.freemud.fuyou.controller;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
import cn.freemud.fuyou.controller.request.CompleteRequest; import cn.freemud.fuyou.controller.request.CompleteRequest;
import cn.freemud.fuyou.controller.request.CreateOrderRequest; import cn.freemud.fuyou.controller.request.CreateOrderRequest;
import cn.freemud.fuyou.controller.request.OrderDetailRequest;
import cn.freemud.fuyou.controller.request.RefundRequest; import cn.freemud.fuyou.controller.request.RefundRequest;
import cn.freemud.fuyou.service.FuYouOrderService; import cn.freemud.fuyou.service.FuYouOrderService;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
...@@ -43,10 +44,22 @@ public class FuYouOrderController { ...@@ -43,10 +44,22 @@ public class FuYouOrderController {
*/ */
@ApiAnnotation(logMessage = "/refund") @ApiAnnotation(logMessage = "/refund")
@PostMapping("/refund") @PostMapping("/refund")
public BaseResponse refundOperation(@Validated @LogParams @RequestBody RefundRequest request) { public BaseResponse refund(@Validated @LogParams @RequestBody RefundRequest request) {
return fuyouOrderService.refund(request); return fuyouOrderService.refund(request);
} }
/**
* 查询订单:
* @param request
* @return
*/
@ApiAnnotation(logMessage = "/detail")
@PostMapping("/detail")
public BaseResponse detail(@Validated @LogParams @RequestBody OrderDetailRequest request) {
return fuyouOrderService.detail(request);
}
/** /**
* 订单完成 * 订单完成
* @param request * @param request
......
order-application-service/src/main/java/cn/freemud/fuyou/controller/request/BaseRequest.java
package cn.freemud.fuyou.controller.request; package cn.freemud.fuyou.controller.request;
import com.freemud.application.sdk.api.ordercenter.request.create.OrderItemCreateReq; import com.freemud.application.sdk.api.ordercenter.request.create.OrderItemCreateReq;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
...@@ -12,45 +13,32 @@ import java.util.List; ...@@ -12,45 +13,32 @@ import java.util.List;
@Setter @Setter
public class BaseRequest { public class BaseRequest {
/** @NotEmpty(message = "thirdOrderCode 不能为空")
* 订单号 private String thirdOrderCode;
*/
@NotEmpty(message = "订单号不能为空")
private String orderCode;
/**
* userId
*/
@NotEmpty(message = "用户id不能为空") @NotEmpty(message = "用户id不能为空")
private String userId; private String userId;
/*** @NotEmpty(message = "posCode不能为空")
* posid private String posCode;
*/
@NotEmpty(message = "posId不能为空")
private String posId;
@NotEmpty(message = "商户id不能为空") @NotEmpty(message = "商户id不能为空")
//商户号
private String partnerId; private String partnerId;
@NotEmpty(message = "门店id不能为空") @NotEmpty(message = "门店id不能为空")
private String storeId; private String storeId;
/** /**
* 支付渠道 * 支付渠道
* 1. 微信，2.支付宝，3.现金 4.svc，5.积分,6优惠券 * 1. 微信，2.支付宝，3.现金 4.svc，5.积分,6优惠券
*/ */
@NotNull(message = "支付渠道不能为空") @NotNull(message = "支付渠道不能为空")
private Integer payChannel; private Integer payChannel;
/** /**
* 支付金额 单位:分 * 支付金额 单位:分
*/ */
@NotNull(message = "支付金额不能为空") @NotNull(message = "支付金额不能为空")
private Long payAmount; private Long payAmount;
/*** /***
* 支付码，微信，支付宝，svc * 支付码，微信，支付宝，svc
*/ */
...@@ -59,18 +47,25 @@ public class BaseRequest { ...@@ -59,18 +47,25 @@ public class BaseRequest {
* 操作人 * 操作人
*/ */
private String operator; private String operator;
/** /**
* 商品信息 * 商品信息
*/ */
private List<OrderItemCreateReq> orderItemList; private List<OrderItemCreateReq> orderItemList;
/*** /***
* 扩展字段 * 扩展字段
* 支付流水号 ，用来查询支付信息,支付接口返回的无需入参 * 支付流水号 ，用来查询支付信息,支付接口返回的无需入参
*/ */
private String fmId; private String fmId;
/**
* 下单渠道
* * 1:自营微信小程序 2:SAAS,i应用 3:自营支付宝小程序 4:自营H5 5:自营安卓APP 6:自营苹果APP 7:自营PC-WEB 8:饿了么 9:饿百 10:京东 11:美团外卖 12:自营APP 13:i应用会员 14:i应用订货 15:POS
*/
@NotNull(message = "orderClient 不能为空")
private String orderClient;
/**
* 根据 thirdOrderCode 查询的数据
*/
private OrderInfoReqs orderInfoReqs;
} }
order-application-service/src/main/java/cn/freemud/fuyou/controller/request/CompleteRequest.java
...@@ -4,22 +4,28 @@ import lombok.Getter; ...@@ -4,22 +4,28 @@ import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Setter @Setter
@Getter @Getter
public class CompleteRequest { public class CompleteRequest {
/** /**
* 订单号 * 三方订单号
*/
@NotEmpty(message = "thirdOrderCode 不能为空")
private String thirdOrderCode;
/**
* 下单渠道
* * 1:自营微信小程序 2:SAAS,i应用 3:自营支付宝小程序 4:自营H5 5:自营安卓APP 6:自营苹果APP 7:自营PC-WEB 8:饿了么 9:饿百 10:京东 11:美团外卖 12:自营APP 13:i应用会员 14:i应用订货 15:POS
*/ */
@NotEmpty(message = "订单号不能为空") @NotNull(message = "orderClient 不能为空")
private String orderCode; private String orderClient;
@NotEmpty(message = "商户id不能为空") @NotEmpty(message = "商户id不能为空")
//商户号
private String partnerId; private String partnerId;
/***
* posid @NotEmpty(message = "posCode不能为空")
*/ private String posCode;
@NotEmpty(message = "posId不能为空")
private String posId;
@NotEmpty(message = "门店id不能为空") @NotEmpty(message = "门店id不能为空")
private String storeId; private String storeId;
......
order-application-service/src/main/java/cn/freemud/fuyou/controller/request/CreateOrderRequest.java
...@@ -18,6 +18,7 @@ import com.freemud.application.sdk.api.ordercenter.request.create.OrderCostCreat ...@@ -18,6 +18,7 @@ import com.freemud.application.sdk.api.ordercenter.request.create.OrderCostCreat
import com.freemud.application.sdk.api.ordercenter.request.create.OrderItemCreateReq; import com.freemud.application.sdk.api.ordercenter.request.create.OrderItemCreateReq;
import com.freemud.application.sdk.api.ordercenter.request.create.OrderSettlementCreateReq; import com.freemud.application.sdk.api.ordercenter.request.create.OrderSettlementCreateReq;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.NotEmpty;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -35,12 +36,14 @@ public class CreateOrderRequest { ...@@ -35,12 +36,14 @@ public class CreateOrderRequest {
private String orderCode; private String orderCode;
//商户号 //商户号
@NotEmpty(message = "partnerId 不能为空")
private String partnerId; private String partnerId;
//商户名 //商户名
private String partnerName; private String partnerName;
//门店编号 //门店编号
@NotEmpty(message = "storeId 不能为空")
private String storeId; private String storeId;
//第三方门店编号 //第三方门店编号
...@@ -56,6 +59,7 @@ public class CreateOrderRequest { ...@@ -56,6 +59,7 @@ public class CreateOrderRequest {
private String toStoreId; private String toStoreId;
//用户ID //用户ID
@NotEmpty(message = "userId 不能为空")
private String userId; private String userId;
//用户姓名 //用户姓名
...@@ -74,6 +78,7 @@ public class CreateOrderRequest { ...@@ -74,6 +78,7 @@ public class CreateOrderRequest {
//订单类型 店内自取实时-1常规堂食 店内自取预约-2预约堂食 店外快递实时-3常规外卖， //订单类型 店内自取实时-1常规堂食 店内自取预约-2预约堂食 店外快递实时-3常规外卖，
// 店外快递预约-4预约外卖 店外自取实时-5常规自取 店外自取预约-6预约自取 // 店外快递预约-4预约外卖 店外自取实时-5常规自取 店外自取预约-6预约自取
// 富有 1:堂食，3：外卖， 7，收银机,8 三方小程序,9 团购
private Integer orderType; private Integer orderType;
//正常情况下不要设置值，此字段仅在做订单同步时使用 //正常情况下不要设置值，此字段仅在做订单同步时使用
...@@ -113,6 +118,7 @@ public class CreateOrderRequest { ...@@ -113,6 +118,7 @@ public class CreateOrderRequest {
private String companySelfCode; private String companySelfCode;
//第三方订单号/客户展示订单编号 //第三方订单号/客户展示订单编号
@NotEmpty(message = "thirdOrderCode 不能为空")
private String thirdOrderCode; private String thirdOrderCode;
//订单备注 //订单备注
...@@ -202,6 +208,7 @@ public class CreateOrderRequest { ...@@ -202,6 +208,7 @@ public class CreateOrderRequest {
//订单商品信息 //订单商品信息
List<OrderItemCreateReq> orderItemList; List<OrderItemCreateReq> orderItemList;
//订单费用信息 //订单费用信息
List<OrderCostCreateReq> orderCostDetailList; List<OrderCostCreateReq> orderCostDetailList;
......
order-application-service/src/main/java/cn/freemud/fuyou/controller/request/DiscountRequest.java
...@@ -10,26 +10,18 @@ import lombok.Setter; ...@@ -10,26 +10,18 @@ import lombok.Setter;
public class DiscountRequest extends BaseRequest { public class DiscountRequest extends BaseRequest {
/** /**
*优惠券 * 优惠券
*/ */
private String coupon; private String coupon;
/** /**
*优惠券 * 优惠券类型
* {@link OldOrderAccountType} * {@link OldOrderAccountType}
*/ */
private String couponType; private String couponType;
/** /**
* 积分 * 积分
*/ */
private Long score; private Long score;
} }
order-application-service/src/main/java/cn/freemud/fuyou/controller/request/OrderDetailRequest.java 0 → 100644
package cn.freemud.fuyou.controller.request;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Setter
@Getter
public class OrderDetailRequest {
/**
* 三方订单号
*/
@NotEmpty(message = "thirdOrderCode 不能为空")
private String thirdOrderCode;
/**
* 下单渠道
* * 1:自营微信小程序 2:SAAS,i应用 3:自营支付宝小程序 4:自营H5 5:自营安卓APP 6:自营苹果APP 7:自营PC-WEB 8:饿了么 9:饿百 10:京东 11:美团外卖 12:自营APP 13:i应用会员 14:i应用订货 15:POS
*/
@NotNull(message = "orderClient 不能为空")
private String orderClient;
}
order-application-service/src/main/java/cn/freemud/fuyou/controller/request/PayQueryRequest.java
...@@ -4,20 +4,30 @@ import lombok.Getter; ...@@ -4,20 +4,30 @@ import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Getter @Getter
@Setter @Setter
public class PayQueryRequest { public class PayQueryRequest {
/** /**
* 订单号 * 三方订单号
*/ */
@NotEmpty(message = "订单号不能为空") @NotEmpty(message = "thirdOrderCode 不能为空")
private String orderCode; private String thirdOrderCode;
/**
* 下单渠道
* * 1:自营微信小程序 2:SAAS,i应用 3:自营支付宝小程序 4:自营H5 5:自营安卓APP 6:自营苹果APP 7:自营PC-WEB 8:饿了么 9:饿百 10:京东 11:美团外卖 12:自营APP 13:i应用会员 14:i应用订货 15:POS
*/
@NotNull(message = "orderClient 不能为空")
private String orderClient;
/*** /***
* posid * posid
*/ */
@NotEmpty(message = "posId不能为空") @NotEmpty(message = "posCode不能为空")
private String posId; private String posCode;
@NotEmpty(message = "商户id不能为空") @NotEmpty(message = "商户id不能为空")
//商户号 //商户号
...@@ -26,6 +36,4 @@ public class PayQueryRequest { ...@@ -26,6 +36,4 @@ public class PayQueryRequest {
@NotEmpty(message = "门店id不能为空") @NotEmpty(message = "门店id不能为空")
private String storeId; private String storeId;
} }
order-application-service/src/main/java/cn/freemud/fuyou/controller/request/RefundRequest.java
...@@ -4,29 +4,37 @@ import lombok.Getter; ...@@ -4,29 +4,37 @@ import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Setter @Setter
@Getter @Getter
public class RefundRequest { public class RefundRequest {
/** /**
* 订单号 * 三方订单号
*/ */
@NotEmpty(message = "订单号不能为空") @NotEmpty(message = "thirdOrderCode 不能为空")
private String orderCode; private String thirdOrderCode;
/** /**
* 下单渠道
* * 1:自营微信小程序 2:SAAS,i应用 3:自营支付宝小程序 4:自营H5 5:自营安卓APP 6:自营苹果APP 7:自营PC-WEB 8:饿了么 9:饿百 10:京东 11:美团外卖 12:自营APP 13:i应用会员 14:i应用订货 15:POS
*/
@NotNull(message = "orderClient 不能为空")
private String orderClient;
/**
* userId * userId
*/ */
@NotEmpty(message = "用户id不能为空") //@NotEmpty(message = "用户id不能为空")
private String userId; private String userId;
/*** /***
* posid * osCode
*/ */
@NotEmpty(message = "posId不能为空") @NotEmpty(message = "posCode不能为空")
private String posId; private String posCode;
@NotEmpty(message = "用户id不能为空") @NotEmpty(message = "门店id不能为空")
private String storeId; private String storeId;
/** /**
......
order-application-service/src/main/java/cn/freemud/fuyou/service/FuYouOrderService.java
...@@ -12,6 +12,7 @@ import cn.freemud.fuyou.feign.request.CouponAvailableReqVo; ...@@ -12,6 +12,7 @@ import cn.freemud.fuyou.feign.request.CouponAvailableReqVo;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
import cn.freemud.fuyou.feign.request.ReturnScoreRequest; import cn.freemud.fuyou.feign.request.ReturnScoreRequest;
import cn.freemud.fuyou.feign.response.*; import cn.freemud.fuyou.feign.response.*;
import cn.freemud.fuyou.service.processor.CashEventProcessor;
import cn.freemud.utils.LogUtil; import cn.freemud.utils.LogUtil;
import cn.freemud.utils.ResponseUtil; import cn.freemud.utils.ResponseUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -47,7 +48,7 @@ import org.springframework.stereotype.Service; ...@@ -47,7 +48,7 @@ import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
import static cn.freemud.enums.ResponseResult.SUCCESS; import static cn.freemud.enums.ResponseResult.*;
@Service @Service
...@@ -63,7 +64,7 @@ public class FuYouOrderService { ...@@ -63,7 +64,7 @@ public class FuYouOrderService {
public FuYouOrderService(OrderSdkService orderSdkService, MapperFacade mapperFacade, public FuYouOrderService(OrderSdkService orderSdkService, MapperFacade mapperFacade,
CouponFeignClient couponFeignClient, CouponFeignClient couponFeignClient,
PaymentNewService paymentNewService, OfflineCouponSdkService offlineCouponSdkService, PaymentNewService paymentNewService, OfflineCouponSdkService offlineCouponSdkService,
ScoreFeignClient scoreFeignClient) { ScoreFeignClient scoreFeignClient) {
this.orderSdkService = orderSdkService; this.orderSdkService = orderSdkService;
this.mapperFacade = mapperFacade; this.mapperFacade = mapperFacade;
...@@ -158,6 +159,21 @@ public class FuYouOrderService { ...@@ -158,6 +159,21 @@ public class FuYouOrderService {
return ResponseUtil.success(orderResponse); return ResponseUtil.success(orderResponse);
} }
/**
* 查询订单详情
* @param request
* @return
*/
public BaseResponse detail(OrderDetailRequest request){
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), null,
request.getThirdOrderCode(),null, LogThreadLocal.getTrackingNo());
if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) {
return ResponseUtil.error(orderInfo.getCode(),orderInfo.getMessage());
}
return ResponseUtil.success(orderInfo.getResult());
}
/** /**
* 退款 * 退款
* TODO 需要分布式事物处理 * TODO 需要分布式事物处理
...@@ -167,9 +183,9 @@ public class FuYouOrderService { ...@@ -167,9 +183,9 @@ public class FuYouOrderService {
*/ */
public BaseResponse refund(RefundRequest req) { public BaseResponse refund(RefundRequest req) {
// 1.退款 // 1.退款
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(req.getOrderCode(), 0, LogThreadLocal.getTrackingNo()); QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(req.getOrderClient(), null,req.getThirdOrderCode(),null, LogThreadLocal.getTrackingNo());
if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) { if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) {
return ResponseUtil.error(orderInfo.getCode(),"订单号不存在"); return ResponseUtil.error(orderInfo.getCode(),orderInfo.getMessage());
} }
final OrderInfoReqs order = orderInfo.getResult(); final OrderInfoReqs order = orderInfo.getResult();
if (ObjectUtils.notEqual(order.getPayState(), PayStatus.HAVE_PAID.getCode())) { if (ObjectUtils.notEqual(order.getPayState(), PayStatus.HAVE_PAID.getCode())) {
...@@ -211,6 +227,13 @@ public class FuYouOrderService { ...@@ -211,6 +227,13 @@ public class FuYouOrderService {
return payorderSeetlment; return payorderSeetlment;
} }
private OrderInfoReqs getOrderByThirdOrderCode(String thirdOrderCode,String orderClient) {
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(orderClient,null,thirdOrderCode, null, LogThreadLocal.getTrackingNo());
if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) {
throw new RuntimeException(orderInfo.getMessage());
}
return orderInfo.getResult();
}
/*** /***
* 支付完成 * 支付完成
...@@ -218,11 +241,15 @@ public class FuYouOrderService { ...@@ -218,11 +241,15 @@ public class FuYouOrderService {
* @return * @return
*/ */
public BaseResponse complete(CompleteRequest request) { public BaseResponse complete(CompleteRequest request) {
OrderInfoReqs orderInfoReqs = getOrderByThirdOrderCode(request.getThirdOrderCode(), request.getOrderClient());
BaseResponse response = new BaseResponse();
if(ObjectUtils.notEqual(PayStatus.HAVE_PAID.getCode(),orderInfoReqs.getPayState())){
return ResponseUtil.error(ORDER_NO_PAU);
}
OrderChangeStateReq req = new OrderChangeStateReq(); OrderChangeStateReq req = new OrderChangeStateReq();
req.setOrderState(OrderStatus.COMPLETE.getCode()); req.setOrderState(OrderStatus.COMPLETE.getCode());
req.setOrderCode(request.getOrderCode()); req.setOrderCode(orderInfoReqs.getOrderCode());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.updateOrderState(req, LogThreadLocal.getTrackingNo()); com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.updateOrderState(req, LogThreadLocal.getTrackingNo());
BaseResponse response = new BaseResponse();
response.setCode(baseResponse.getCode()); response.setCode(baseResponse.getCode());
response.setMessage(baseResponse.getMessage()); response.setMessage(baseResponse.getMessage());
return response; return response;
......
order-application-service/src/main/java/cn/freemud/fuyou/service/PaymentService.java
...@@ -7,6 +7,7 @@ import cn.freemud.fuyou.controller.request.DiscountRequest; ...@@ -7,6 +7,7 @@ import cn.freemud.fuyou.controller.request.DiscountRequest;
import cn.freemud.fuyou.controller.request.PayQueryRequest; import cn.freemud.fuyou.controller.request.PayQueryRequest;
import cn.freemud.fuyou.feign.ScoreFeignClient; import cn.freemud.fuyou.feign.ScoreFeignClient;
import cn.freemud.fuyou.service.processor.EventProcessorRegister; import cn.freemud.fuyou.service.processor.EventProcessorRegister;
import cn.freemud.utils.ResponseUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.constant.ResponseConstant; import com.freemud.application.sdk.api.ordercenter.constant.ResponseConstant;
...@@ -77,19 +78,7 @@ public class PaymentService { ...@@ -77,19 +78,7 @@ public class PaymentService {
return eventProcessorRegister.getEventProcessor(payChannelEnum.getCode()).process(discountRequest); return eventProcessorRegister.getEventProcessor(payChannelEnum.getCode()).process(discountRequest);
} }
/**
* 获取订详情
*
* @param orderCOde 订单号
* @return
*/
protected OrderInfoReqs getOrder(String orderCOde) {
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(orderCOde, 0, LogThreadLocal.getTrackingNo());
if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) {
throw new RuntimeException("订单号不存在");
}
return orderInfo.getResult();
}
/** /**
* 查询支付结果，微信，支付宝，svc * 查询支付结果，微信，支付宝，svc
...@@ -98,6 +87,13 @@ public class PaymentService { ...@@ -98,6 +87,13 @@ public class PaymentService {
* @return * @return
*/ */
public BaseResponse paymentQuery(PayQueryRequest request) { public BaseResponse paymentQuery(PayQueryRequest request) {
QueryByCodeResponse queryByCodeResponse = orderSdkService.getOrderInfo(request.getOrderClient(), null,request.getThirdOrderCode(),null, LogThreadLocal.getTrackingNo());
if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, queryByCodeResponse.getCode())) {
throw new RuntimeException(queryByCodeResponse.getMessage());
}
OrderInfoReqs order = queryByCodeResponse.getResult();
log.info("paymentQuery:request:{}", JSON.toJSONString(request)); log.info("paymentQuery:request:{}", JSON.toJSONString(request));
BaseResponse baseResponse = new BaseResponse(); BaseResponse baseResponse = new BaseResponse();
baseResponse.setCode(ResponseConstant.SUCCESS_RESPONSE_CODE); baseResponse.setCode(ResponseConstant.SUCCESS_RESPONSE_CODE);
...@@ -105,9 +101,9 @@ public class PaymentService { ...@@ -105,9 +101,9 @@ public class PaymentService {
channelRequest.setPartnerId(request.getPartnerId()); channelRequest.setPartnerId(request.getPartnerId());
channelRequest.setVer("2"); channelRequest.setVer("2");
channelRequest.setStoreId(request.getStoreId()); channelRequest.setStoreId(request.getStoreId());
channelRequest.setTransId(request.getOrderCode()); channelRequest.setTransId(order.getOrderCode());
channelRequest.setFrontTransId(request.getOrderCode()); channelRequest.setFrontTransId(order.getOrderCode());
channelRequest.setStationId(request.getPosId()); channelRequest.setStationId(request.getPosCode());
com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponse> query = paymentNewService.queryOrder(channelRequest, LogThreadLocal.getTrackingNo()); com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponse> query = paymentNewService.queryOrder(channelRequest, LogThreadLocal.getTrackingNo());
baseResponse.setCode(query.getCode()); baseResponse.setCode(query.getCode());
baseResponse.setMessage(query.getMessage()); baseResponse.setMessage(query.getMessage());
...@@ -115,10 +111,10 @@ public class PaymentService { ...@@ -115,10 +111,10 @@ public class PaymentService {
log.error("scoreFeignClient.query,error:{},入参:{}", JSON.toJSONString(query), JSON.toJSONString(channelRequest)); log.error("scoreFeignClient.query,error:{},入参:{}", JSON.toJSONString(query), JSON.toJSONString(channelRequest));
return baseResponse; return baseResponse;
} }
OrderInfoReqs order = getOrder(request.getOrderCode());
//final PayChannelEnum payChannelEnum = getPayChannelEnum(request.getPayChannel()); //final PayChannelEnum payChannelEnum = getPayChannelEnum(request.getPayChannel());
PaySuccessReq req = new PaySuccessReq(); PaySuccessReq req = new PaySuccessReq();
req.setOrderCode(request.getOrderCode()); req.setOrderCode(order.getOrderCode());
req.setActualPayAmount(String.valueOf(query.getData().getAmount())); req.setActualPayAmount(String.valueOf(query.getData().getAmount()));
req.setPayChannel(query.getData().getPayCode()); req.setPayChannel(query.getData().getPayCode());
req.setPayRequestNo(query.getData().getTransactionCode()); req.setPayRequestNo(query.getData().getTransactionCode());
......
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/AbstractProcessor.java
...@@ -115,14 +115,30 @@ public abstract class AbstractProcessor implements EventProcessor { ...@@ -115,14 +115,30 @@ public abstract class AbstractProcessor implements EventProcessor {
return orderInfo.getResult(); return orderInfo.getResult();
} }
/**
* 根据三方订单号查询
* @param thirdOrderCode
* @return
*/
protected OrderInfoReqs getOrderByThirdOrderCode(String thirdOrderCode,String orderClient) {
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(orderClient,null,thirdOrderCode, null, LogThreadLocal.getTrackingNo());
if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) {
throw new RuntimeException(orderInfo.getMessage());
}
return orderInfo.getResult();
}
@Override @Override
public BaseResponse process(DiscountRequest request) { public BaseResponse process(DiscountRequest request) {
// 三方订单号兑换 订单信息
OrderInfoReqs orderInfoReqs = getOrderByThirdOrderCode(request.getThirdOrderCode(),request.getOrderClient());
request.setOrderInfoReqs(orderInfoReqs);
log.info("process.DiscountRequest:{}", JSON.toJSONString(request)); log.info("process.DiscountRequest:{}", JSON.toJSONString(request));
BaseResponse response = doProcess(request); BaseResponse response = doProcess(request);
if (ObjectUtils.notEqual(SUCCESS.code, response.getCode())) { if (ObjectUtils.notEqual(SUCCESS.code, response.getCode())) {
return response; return response;
} }
log.info("AbstractProcessor.process,orderCode:{},responst:{}", request.getOrderCode(), JSON.toJSONString(response)); log.info("AbstractProcessor.process,orderCode:{},responst:{}", orderInfoReqs.getOrderCode(), JSON.toJSONString(response));
OrderSettlementReq orderSettlement = getOrderSettlement(request); OrderSettlementReq orderSettlement = getOrderSettlement(request);
// 2.创建结算信息 // 2.创建结算信息
// todo 分布式事物处理 // todo 分布式事物处理
......
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/AliPayEventProcessor.java
...@@ -94,7 +94,7 @@ private final PaymentNewService paymentNewService; ...@@ -94,7 +94,7 @@ private final PaymentNewService paymentNewService;
BaseResponse doProcess(DiscountRequest request) { BaseResponse doProcess(DiscountRequest request) {
BaseResponse baseResponse =new BaseResponse(); BaseResponse baseResponse =new BaseResponse();
baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode()); baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode());
OrderInfoReqs orderInfoReqs = getOrder(request.getOrderCode()); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
CodePayRequest codePayRequest =new CodePayRequest(); CodePayRequest codePayRequest =new CodePayRequest();
codePayRequest.setCode(request.getCode()); codePayRequest.setCode(request.getCode());
...@@ -109,7 +109,7 @@ private final PaymentNewService paymentNewService; ...@@ -109,7 +109,7 @@ private final PaymentNewService paymentNewService;
codePayRequest.setStoreId(orderInfoReqs.getStoreId()); codePayRequest.setStoreId(orderInfoReqs.getStoreId());
codePayRequest.setFrontTransId(orderInfoReqs.getOrderCode()); codePayRequest.setFrontTransId(orderInfoReqs.getOrderCode());
codePayRequest.setVer("2"); codePayRequest.setVer("2");
//codePayRequest.setPayCode("10095"); // codePayRequest.setClientCode(10095L);
codePayRequest.setTransId(orderInfoReqs.getOrderCode()); codePayRequest.setTransId(orderInfoReqs.getOrderCode());
codePayRequest.setProducts(convertPayProduct(request.getOrderItemList())); codePayRequest.setProducts(convertPayProduct(request.getOrderItemList()));
com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> codePayResponseBaseResponse = paymentNewService.codePay(codePayRequest, LogThreadLocal.getTrackingNo()); com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> codePayResponseBaseResponse = paymentNewService.codePay(codePayRequest, LogThreadLocal.getTrackingNo());
...@@ -130,7 +130,7 @@ private final PaymentNewService paymentNewService; ...@@ -130,7 +130,7 @@ private final PaymentNewService paymentNewService;
@Override @Override
OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
OrderInfoReqs orderInfoReqs = getOrder(request.getOrderCode()); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
return buildOrderSettlement("支付宝支付", OrderSettlementType.ALIPAY, true, orderInfoReqs, request); return buildOrderSettlement("支付宝支付", OrderSettlementType.ALIPAY, true, orderInfoReqs, request);
} }
......
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/CashEventProcessor.java
...@@ -33,10 +33,13 @@ public class CashEventProcessor extends AbstractProcessor { ...@@ -33,10 +33,13 @@ public class CashEventProcessor extends AbstractProcessor {
return baseResponse; return baseResponse;
} }
public OrderInfoReqs getOrderByThirdOrderCode(String thirdOrderCode, String orderClient) {
return super.getOrderByThirdOrderCode(thirdOrderCode, orderClient);
}
@Override @Override
OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
OrderInfoReqs orderInfoReqs = getOrder(request.getOrderCode()); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
return buildOrderSettlement("富有现金支付", OrderSettlementType.CASH, false, orderInfoReqs, request); return buildOrderSettlement("富有现金支付", OrderSettlementType.CASH, false, orderInfoReqs, request);
} }
......
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/CouponEventProcessor.java
...@@ -47,7 +47,7 @@ public class CouponEventProcessor extends AbstractProcessor { ...@@ -47,7 +47,7 @@ public class CouponEventProcessor extends AbstractProcessor {
com.freemud.application.sdk.api.ordercenter.response.BaseResponse doProcess(DiscountRequest request) { com.freemud.application.sdk.api.ordercenter.response.BaseResponse doProcess(DiscountRequest request) {
com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = new com.freemud.application.sdk.api.ordercenter.response.BaseResponse(); com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = new com.freemud.application.sdk.api.ordercenter.response.BaseResponse();
baseResponse.setCode(SUCCESS.code); baseResponse.setCode(SUCCESS.code);
OrderInfoReqs orderInfoReqs = getOrder(request.getOrderCode()); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
//1.核销券 //1.核销券
CouponRequest couponCodeVerificationDto = new CouponRequest(); CouponRequest couponCodeVerificationDto = new CouponRequest();
couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1)); couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1));
...@@ -55,7 +55,7 @@ public class CouponEventProcessor extends AbstractProcessor { ...@@ -55,7 +55,7 @@ public class CouponEventProcessor extends AbstractProcessor {
couponCodeVerificationDto.setPartnerId(Integer.parseInt(orderInfoReqs.getPartnerId())); couponCodeVerificationDto.setPartnerId(Integer.parseInt(orderInfoReqs.getPartnerId()));
//自取：pickup，外送：delivery，麦咖啡微信小程序：mocoffee_wx，麦咖啡支付宝小程序：mocoffee_zfb //自取：pickup，外送：delivery，麦咖啡微信小程序：mocoffee_wx，麦咖啡支付宝小程序：mocoffee_zfb
couponCodeVerificationDto.setChannel("pickup"); couponCodeVerificationDto.setChannel("pickup");
couponCodeVerificationDto.setStation_id(request.getPosId()); couponCodeVerificationDto.setStation_id(request.getPosCode());
couponCodeVerificationDto.setOperator_id("-1"); couponCodeVerificationDto.setOperator_id("-1");
couponCodeVerificationDto.setStore_id(orderInfoReqs.getStoreId()); couponCodeVerificationDto.setStore_id(orderInfoReqs.getStoreId());
//核销不需要核销通知 //核销不需要核销通知
...@@ -99,7 +99,7 @@ public class CouponEventProcessor extends AbstractProcessor { ...@@ -99,7 +99,7 @@ public class CouponEventProcessor extends AbstractProcessor {
@Override @Override
OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
OrderInfoReqs orderInfoReqs = getOrder(request.getOrderCode()); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
return buildOrderSettlement("富有优惠券", OrderSettlementType.COUPON, false, orderInfoReqs, request); return buildOrderSettlement("富有优惠券", OrderSettlementType.COUPON, false, orderInfoReqs, request);
} }
......
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/IntegralEventProcessor.java
...@@ -39,7 +39,7 @@ public class IntegralEventProcessor extends AbstractProcessor { ...@@ -39,7 +39,7 @@ public class IntegralEventProcessor extends AbstractProcessor {
BaseResponse doProcess(DiscountRequest request) { BaseResponse doProcess(DiscountRequest request) {
BaseResponse baseResponse = new BaseResponse(); BaseResponse baseResponse = new BaseResponse();
baseResponse.setCode(SUCCESS.code); baseResponse.setCode(SUCCESS.code);
final OrderInfoReqs order = getOrder(request.getOrderCode()); final OrderInfoReqs order = request.getOrderInfoReqs();
ScorePayRequest scorePayRequest = new ScorePayRequest(); ScorePayRequest scorePayRequest = new ScorePayRequest();
scorePayRequest.setPartnerId(order.getPartnerId()); scorePayRequest.setPartnerId(order.getPartnerId());
...@@ -49,9 +49,9 @@ public class IntegralEventProcessor extends AbstractProcessor { ...@@ -49,9 +49,9 @@ public class IntegralEventProcessor extends AbstractProcessor {
scorePayRequest.setOperationType(14); scorePayRequest.setOperationType(14);
scorePayRequest.setIdempotencyBussinessType("5"); scorePayRequest.setIdempotencyBussinessType("5");
scorePayRequest.setChangeScore(request.getScore().intValue()); scorePayRequest.setChangeScore(request.getScore().intValue());
scorePayRequest.setIdempotencyBussinessId(request.getOrderCode()); scorePayRequest.setIdempotencyBussinessId(order.getOrderCode());
cn.freemud.base.entity.BaseResponse<UpdateScoreResponse> responseBaseResponse = scoreFeignClient.pay(scorePayRequest); cn.freemud.base.entity.BaseResponse<UpdateScoreResponse> responseBaseResponse = scoreFeignClient.pay(scorePayRequest);
log.info("scoreFeignClient.pay,order:{},response:{}", request.getOrderCode(), JSON.toJSONString(responseBaseResponse)); log.info("scoreFeignClient.pay,order:{},response:{}", order.getOrderCode(), JSON.toJSONString(responseBaseResponse));
if (ObjectUtils.notEqual(SUCCESS.code, responseBaseResponse.getCode())) { if (ObjectUtils.notEqual(SUCCESS.code, responseBaseResponse.getCode())) {
baseResponse.setCode(responseBaseResponse.getCode()); baseResponse.setCode(responseBaseResponse.getCode());
baseResponse.setMessage(responseBaseResponse.getMessage()); baseResponse.setMessage(responseBaseResponse.getMessage());
...@@ -62,7 +62,7 @@ public class IntegralEventProcessor extends AbstractProcessor { ...@@ -62,7 +62,7 @@ public class IntegralEventProcessor extends AbstractProcessor {
@Override @Override
OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
OrderInfoReqs orderInfoReqs = getOrder(request.getOrderCode()); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
return buildOrderSettlement("富有积分兑换", OrderSettlementType.POINTS, true, orderInfoReqs, request); return buildOrderSettlement("富有积分兑换", OrderSettlementType.POINTS, true, orderInfoReqs, request);
} }
......
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/SvcEventProcessor.java
...@@ -41,7 +41,7 @@ public class SvcEventProcessor extends AbstractProcessor { ...@@ -41,7 +41,7 @@ public class SvcEventProcessor extends AbstractProcessor {
{ {
BaseResponse baseResponse =new BaseResponse(); BaseResponse baseResponse =new BaseResponse();
baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode()); baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode());
OrderInfoReqs orderInfoReqs = getOrder(request.getOrderCode()); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
CodePayRequest codePayRequest =new CodePayRequest(); CodePayRequest codePayRequest =new CodePayRequest();
codePayRequest.setCode(request.getCode()); codePayRequest.setCode(request.getCode());
...@@ -74,7 +74,7 @@ public class SvcEventProcessor extends AbstractProcessor { ...@@ -74,7 +74,7 @@ public class SvcEventProcessor extends AbstractProcessor {
@Override @Override
OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
OrderInfoReqs orderInfoReqs = getOrder(request.getOrderCode()); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
return buildOrderSettlement("SVV支付", OrderSettlementType.SVC, true, orderInfoReqs, request); return buildOrderSettlement("SVV支付", OrderSettlementType.SVC, true, orderInfoReqs, request);
} }
......
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/WeChatEventProcessor.java
...@@ -36,7 +36,7 @@ public class WeChatEventProcessor extends AbstractProcessor{ ...@@ -36,7 +36,7 @@ public class WeChatEventProcessor extends AbstractProcessor{
BaseResponse doProcess(DiscountRequest request) { BaseResponse doProcess(DiscountRequest request) {
BaseResponse baseResponse =new BaseResponse(); BaseResponse baseResponse =new BaseResponse();
baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode()); baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode());
OrderInfoReqs orderInfoReqs = getOrder(request.getOrderCode()); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest codePayRequest =new CodePayRequest(); com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest codePayRequest =new CodePayRequest();
codePayRequest.setCode(request.getCode()); codePayRequest.setCode(request.getCode());
codePayRequest.setAmount(request.getPayAmount()); codePayRequest.setAmount(request.getPayAmount());
...@@ -48,7 +48,7 @@ public class WeChatEventProcessor extends AbstractProcessor{ ...@@ -48,7 +48,7 @@ public class WeChatEventProcessor extends AbstractProcessor{
codePayRequest.setStationId("1"); codePayRequest.setStationId("1");
codePayRequest.setOperatorId("1"); codePayRequest.setOperatorId("1");
codePayRequest.setVer("2"); codePayRequest.setVer("2");
//codePayRequest.setCode("10102"); //codePayRequest.setClientCode(100037L);
codePayRequest.setPartnerId(orderInfoReqs.getPartnerId()); codePayRequest.setPartnerId(orderInfoReqs.getPartnerId());
codePayRequest.setTransId(orderInfoReqs.getOrderCode()); codePayRequest.setTransId(orderInfoReqs.getOrderCode());
...@@ -68,7 +68,7 @@ public class WeChatEventProcessor extends AbstractProcessor{ ...@@ -68,7 +68,7 @@ public class WeChatEventProcessor extends AbstractProcessor{
@Override @Override
OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
OrderInfoReqs orderInfoReqs = getOrder(request.getOrderCode()); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
return buildOrderSettlement("微信支付", OrderSettlementType.WEIXIN, true, orderInfoReqs, request); return buildOrderSettlement("微信支付", OrderSettlementType.WEIXIN, true, orderInfoReqs, request);
} }
......
ordercenter-sdk/readme.md
...@@ -3,20 +3,46 @@ ...@@ -3,20 +3,46 @@
| 版本号 | 版本说明 | 更新人 | 更新时间 | | 版本号 | 版本说明 | 更新人 | 更新时间 |
| ------------ | ---------------- | ------ | ---------- | | ------------ | ---------------- | ------ | ---------- |
| 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 | | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
| 1.1.0.RELEASE| 1.9.8需求打包release版本 | 侯书虎 | 2019-12-26 |
| 1.1.1.RELEASE| 1.9.9需求打包release版本 | 丁凯 | 2020-01-08 |
| 1.1.2.RELEASE| 农工商订单submit | 侯书虎 | 2020-01-13 |
| 1.1.3.RELEASE| 开放平台创建订单 | 姜海波 | 2020-02-24 |
| 1.1.4-SNAPSHOT | 优化活动订单 | 胡超 | 2020-02-10 | | 1.1.4-SNAPSHOT | 优化活动订单 | 胡超 | 2020-02-10 |
| 1.1.6-SNAPSHOT | OrderExtInfo新增formId | wuping | 2020-02-27 | | 1.1.6-SNAPSHOT | OrderExtInfo新增formId | wuping | 2020-02-27 |
| 1.1.6.RELEASE | 升级RELEASE | wuping | 2020-03-04 |
| 1.1.7-SNAPSHOT | 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 | | 1.1.7-SNAPSHOT | 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 |
| 1.1.8-SNAPSHOT | 预约单接单接口增加预约任务 | wuping | 2020-03-17 | | 1.1.8-SNAPSHOT | 预约单接单接口增加预约任务 | wuping | 2020-03-17 |
| 1.1.8.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
| 1.1.9.RELEASE | 满额减配送费RELEASE | dingkai | 2020-03-26 |
| 1.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |
| 1.2.1.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
| 1.2.2.RELEASE | 新增真实配送费 | 海波 | 2020-04-27 |
| 1.2.2.RELEASE | ES查询增加异常单状态 | 李小二 | 2020-04-27 |
| 1.2.3.RELEASE | 配送费实际金额 | 胡超 | 2020-05-11 |
| 1.2.4.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
| 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 |
| 1.2.6.RELEASE | 增加售后阶段 | 海波 | 2020-05-14 |
| 1.2.7.RELEASE | 全单退增加是否退配送费 | 海波 | 2020-05-14 |
| 1.1.9-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 | | 1.1.9-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
| 1.2.8.RELEASE | 1.1.9-SNAPSHOT升RELEASE版本 | wuping | 2020-05-18 |
| 1.2.9.RELEASE | 规范orderExtInfoDto | 侯书虎 | 2020-05-19 |
| 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 | | 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 |
| 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 | | 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
| 1.2.10.RELEASE | 增加售后单任务 | wuping | 2020-05-21 |
| 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
| 1.3.1.RELEASE | 增加下游订单号 | 海波 | 2020-06-01 |
| 1.3.2.RELEASE | 增加非码微店类型 | 梁崇福 | 2020-06-05 |
| 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 | | 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 |
| 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 | | 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
| 1.3.3.RELEASE | 买券订单修改升级RELEASE | wuping | 2020-06-10 |
| 1.3.13-SNAPSHOT | 预约单任务删除 | wuping | 2020-06-05 | | 1.3.13-SNAPSHOT | 预约单任务删除 | wuping | 2020-06-05 |
| 1.3.4.RELEASE | 预约单任务删除RELEASE | wuping | 2020-06-15 |
| 1.3.5.RELEASE | 围餐 | dingkai | 2020-06-16 |
| 1.3.6.RELEASE | 小助手营业额统计 | 梁崇福 | 2020-06-22 |
| 1.3.7.RELEASE | 停车场sdk | dingkai | 2020-06-22 |
| 1.3.8.RELEASE | 增加小程序场景值 | 李小二 | 2020-07-01 |
| 1.3.9.RELEASE | 增加支付渠道编号 | 李小二 | 2020-07-08 |
| 1.3.10.RELEASE | OrderExtInfoDto新增parkingAreaName | wuping | 2020-07-13 |
| 1.3.14-SNAPSHOT | es综合查询新增appId查询条件 | wuping | 2020-06-30 | | 1.3.14-SNAPSHOT | es综合查询新增appId查询条件 | wuping | 2020-06-30 |
| 1.4.31-SNAPSHOT | 增加手动录单，和完成订单接口 |张虹旺| 2020-07-18 | 1.3.11.RELEASE | 新增常量类转化 | 张志恒 | 2020-08-04 |
| 1.4.32-SNAPSHOT | 最新快照版本| 李小二 |2020-08-05 1.3.22.RELEASE | 枚举增加SVC | 张虹旺 | 2020-08-27 |
| 1.4.33-SNAPSHOT | 新增修改取餐码接口| 谌会阳 |2020-08-08 \ No newline at end of file
| 1.4.35-SNAPSHOT | 麦咖啡| 谌会阳 |2020-08-08
| 1.4.36-SNAPSHOT | 修复queryRelatedOrderByCode反序列化报错| 肖家炜 |2020-08-25
| 1.4.37-SNAPSHOT | 麦咖啡汇集回调，调用基础服务方法 | 徐康 | 2020-09-02 |
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