Merge remote-tracking branch 'origin/master'

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

@@ -72,6 +72,8 @@ import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
+import com.freemud.sdk.api.assortment.orderdistributor.entity.dto.PaymentMqMessageDto;
+import com.freemud.sdk.api.assortment.orderdistributor.service.PaymentQueueService;
 import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
 import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
 import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
@@ -150,6 +152,8 @@ public class MallOrderServiceImpl implements MallOrderService {
 
     @Autowired
     private AssortmentCustomerInfoManager assortmentCustomerInfoManager;
+    @Autowired
+    private PaymentQueueService paymentQueueService;
 
     /**
      * 创建订单
@@ -369,12 +373,17 @@ public class MallOrderServiceImpl implements MallOrderService {
 
     public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount) {
         try {
+            OrderPayResponse orderPayResponse;
             UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, orderBean.getOid());
             com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
             if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
-                return null;
+                ApiLog.info("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
+                // 1.9.34 预支付失败需要把原因进行记录
+                orderPayResponse = new OrderPayResponse();
+                orderPayResponse.setMsg(responseBase.getMessage());
+                return orderPayResponse;
             }
-            OrderPayResponse orderPayResponse = orderAdapter.convent2OrderPayResponse(responseBase.getData());
+            orderPayResponse = orderAdapter.convent2OrderPayResponse(responseBase.getData());
             orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
             orderPayResponse.setOpenId(paymentRequest.getOpenId());
             orderPayResponse.setPartnerId(orderBean.getCompanyId());
@@ -383,6 +392,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             if (orderPayResponse.getPayOrder() != null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())) {
                 orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
             }
+            putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getData().getFmId(), orderBean.getOid());
             return orderPayResponse;
         } catch (Exception e) {
             LogUtil.error("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest));
@@ -1053,4 +1063,25 @@ public class MallOrderServiceImpl implements MallOrderService {
         }
         return result;
     }
+    /**
+     * 获取预支付成功，将信息放入死心队列，当支付成功没有回掉的时候处理
+     *
+     * @param partnerId
+     * @param storeId
+     * @param fmId
+     * @param orderId
+     */
+    public void putDelMq(String partnerId, String storeId, String fmId, String orderId) {
+        PaymentMqMessageDto dto = new PaymentMqMessageDto();
+        try {
+            dto.setFmId(fmId);
+            dto.setOrderId(orderId);
+            dto.setPartnerId(partnerId);
+            dto.setStoreId(storeId);
+            dto.setTrackingNo(LogThreadLocal.getTrackingNo());
+            paymentQueueService.paymentCallback(dto);
+        } catch (Exception e) {
+            LogUtil.error("paymentQueueService.paymentCallback", "", orderId, e);
+        }
+    }
 }