买券虚拟订单支付成功即订单给完成

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

@@ -65,6 +65,8 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
     private OrderAdapter orderAdapter;
     @Autowired
     private OrderCommonService orderCommonService;
+    @Autowired
+    private SellCouponOrderServiceImpl sellCouponOrderService;
 
 
     @Override
@@ -172,6 +174,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             if(OrderSourceType.APP.getCode().equals(orderBean.getSource())) {
                 return appOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
             }
+            //买券虚拟订单
+            if(orderBean.getBizType() == 6) {
+                return sellCouponOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
+            }
             /**
              * 默认点餐处理
              */

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

@@ -3,8 +3,12 @@ package cn.freemud.service.impl;
 import cn.freemud.adapter.OrderAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
+import cn.freemud.entities.dto.ConfirmOrderDto;
+import cn.freemud.entities.dto.QueryOrdersResponseDto;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
+import cn.freemud.entities.vo.PaysuccessNoticeMessage;
 import cn.freemud.entities.vo.SellCouponCreateOrderVo;
+import cn.freemud.enums.OrderBeanType;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.enums.UserLoginChannelEnum;
 import cn.freemud.interceptor.ServiceException;
@@ -24,8 +28,10 @@ import com.freemud.application.sdk.api.couponcenter.online.response.CouponDetail
 import com.freemud.application.sdk.api.couponcenter.online.service.FMActiveSdkService;
 import com.freemud.application.sdk.api.couponcenter.online.service.OnlineCouponSdkService;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
+import com.freemud.application.sdk.api.ordercenter.request.OrderChangeStateReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.create.*;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
@@ -41,6 +47,7 @@ import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -347,6 +354,31 @@ public class SellCouponOrderServiceImpl {
 
 
     /**
+     *
+     * @param message
+     * @param confirmOrderDto
+     * @param orderBeans
+     * @return
+     */
+    public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans) {
+        QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
+        OrderChangeStateReq request = new OrderChangeStateReq();
+        request.setOrderCode(orderBean.getOid());
+        request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
+        request.setOperator(orderBean.getUserName());
+        request.setRemark("已完成");
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse updateOrderStateResp = orderSdkService.updateOrderState(request, LogThreadLocal.getTrackingNo());
+        orderSdkAdapter.convent2BaseOrderResponse(updateOrderStateResp);
+        Map<String, Object> map = Maps.newTreeMap();
+        map.put("code", 100);
+        map.put("message", "success");
+        return JSONObject.toJSONString(map);
+    }
+
+
+
+
+    /**
      * 查询券详情
      *
      * @param partnerId