zoujiajian 3 лет назад
Родитель
Сommit
2dd4fa7ef3

+ 6 - 0
netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -12,10 +12,12 @@ import com.cyksj.config.zfb.ZfbProductCode;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.OrderDonMapper;
+import com.cyksj.mapper.OrderDonWaybillMapper;
 import com.cyksj.mapper.channel.UserPayEquipmentAvailableBenefitsMapper;
 import com.cyksj.model.dto.AliPayParams;
 import com.cyksj.model.dto.H5JsPayParams;
 import com.cyksj.model.entity.OrderDon;
+import com.cyksj.model.entity.OrderDonWaybill;
 import com.cyksj.model.entity.UserPayEquipmentAvailableBenefits;
 import com.cyksj.model.manage.views.OrderDonView;
 import com.cyksj.model.request.AlipayOrderDonReq;
@@ -69,6 +71,9 @@ public class OrderController {
     @Autowired
     private UserPayEquipmentAvailableBenefitsMapper availableBenefitsMapper;
 
+    @Autowired
+    private OrderDonWaybillMapper waybillMapper;
+
     /**
      * 支付
      * @author chan
@@ -309,6 +314,7 @@ public class OrderController {
                     .eq(UserPayEquipmentAvailableBenefits::getRealOrderId, data.getId())
                     .eq(UserPayEquipmentAvailableBenefits::getDeleted, true));
             data.setIsHasBenefits(count > 0 ? true : false);
+            data.setWaybill(waybillMapper.selectOne(Wrappers.lambdaQuery(OrderDonWaybill.class).eq(OrderDonWaybill::getOrderId, data.getId()).last("limit 1")));
         });
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }