Merge branch 'feature/xukang_20201018_双十一冲刺需求'

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -202,7 +202,8 @@ public class OrderController {
     @ApiAnnotation(logMessage = "queryOrderById")
     @PostMapping("/queryOrderById")
     public BaseResponse queryOrderById(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
-        return orderservice.queryOrderById(queryOrderVo.getOperation(),queryOrderVo.getSessionId(), queryOrderVo.getOid(),queryOrderVo.getPartnerId(),queryOrderVo.getChannelType());
+        return orderservice.queryOrderById(queryOrderVo.getOperation(),queryOrderVo.getSessionId(), queryOrderVo.getOid(),queryOrderVo.getPartnerId(),queryOrderVo.getChannelType()
+                ,queryOrderVo.getIsQueryAfterPay(),queryOrderVo.getPayGiftVer());
     }
 
 

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderVo.java

@@ -100,4 +100,9 @@ public class QueryOrderVo {
      */
     private Boolean needInvoice;
 
+    /**
+     * 是否支付后查询   1:已支付   0：未支付
+     */
+    private Integer isQueryAfterPay = 0;
+
 }

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -68,7 +68,7 @@ public interface Orderservice extends OrderFactoryService{
      * @param oid       订单ID
      * @return
      */
-    BaseResponse queryOrderById(Integer operation, String sessionId, String oid, String partnerId, String channel);
+    BaseResponse queryOrderById(Integer operation, String sessionId, String oid, String partnerId, String channel, Integer isQueryAfterPay,Integer payGiftVer);
 
     BaseResponse cancelPayOrder(DeleteOrderVo deleteOrderVo);
 

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1444,7 +1444,7 @@ public class OrderServiceImpl implements Orderservice {
     @Override
     public BaseResponse queryCollageOrderById(Integer operation, String sessionId, String oid, String partnerId, String channel) {
 
-        BaseResponse orderInfoRes = this.queryOrderById(operation, sessionId, oid, partnerId, channel);
+        BaseResponse orderInfoRes = this.queryOrderById(operation, sessionId, oid, partnerId, channel, 0, null);
 
         if (null == orderInfoRes.getResult() || !String.valueOf(RESPONSE_SUCCESS_CODE).equals(orderInfoRes.getCode())) {
             return orderInfoRes;
@@ -1683,7 +1683,7 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     @Override
-    public BaseResponse queryOrderById(Integer operation, String sessionId, String oid, String partnerId, String channel) {
+    public BaseResponse queryOrderById(Integer operation, String sessionId, String oid, String partnerId, String channel, Integer isQueryAfterPay, Integer payGiftVer) {
         AssortmentCustomerInfoVo userInfo = customerInfoManager.getCustomerInfoByObject(sessionId);
         if (userInfo == null || StringUtils.isEmpty(userInfo.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
@@ -1808,6 +1808,8 @@ public class OrderServiceImpl implements Orderservice {
         // 目前只有coco在订单详情参加支付有礼，且不检查订单的状态
         if (cocoPartnerId.contains(partnerId)) {
             joinPayGift(sessionId, queryOrderResponseVo, partnerId, null);
+        } else if(BizTypeEnum.SALE_COUPON.getBizType().equals(orderBean.getBizType()) && Integer.valueOf(1).equals(isQueryAfterPay)) {
+            joinPayGift(sessionId, queryOrderResponseVo, partnerId, payGiftVer);
         }
 
         //拼团订单