123

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/OrderGoodsDTO.java

@@ -20,7 +20,7 @@ public class OrderGoodsDTO {
      *  商品id
      */
     @ApiModelProperty(value = "商品id")
-    private Integer goodId;
+    private String goodId;
 
     /**
      *  商品类型;1-租车；2-旅游；3-会员订单;4-营地

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserSellingWater.java

@@ -80,7 +80,7 @@ public class AppUserSellingWater implements Serializable {
      */
     @Column(name = "good_id")
 	@ApiModelProperty(value = "商品id")
-    private Integer goodId;
+    private String goodId;
 	
 	    /**
      *  商品数量

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -101,7 +101,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         String orderNo = orderWaterDTO.getOrderNo();
         //用户id
         Integer userId = orderWaterDTO.getUserId();
-        Integer goodId=0;
+        String goodId = null;
         Integer orderType = 0;
         String title=null;
         String img=null;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseOrderAcceptDetailedBiz.java

@@ -11,6 +11,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.feign.OrderFeign;
 import com.xxfc.platform.order.pojo.dto.OrderDetailDTO;
 import com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO;
@@ -74,15 +75,15 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
             log.info("分账----orderWater----参数不能为空----status===" + status);
             return;
         }
-        if (status == 1) {
-            payOrderAccept(orderWaterDTO);
-        } else if (status == 2) {
         ObjectRestResponse<OrderDetailDTO> restResponse = orderFeign.getOrderDetail(orderWaterDTO.getOrderNo(), status);
         if (restResponse.getData() == null ){
             log.info("分账----订单信息不存在----参数不能为空---" );
             return;
         }
         OrderDetailDTO orderDetailDTO = restResponse.getData();
+        if (status == 1) {
+            payOrderAccept(orderWaterDTO,orderDetailDTO);
+        } else if (status == 2) {
             BigDecimal acceptAmount = orderDetailDTO.getAcceptAmount();
             log.info("分账----acceptAmount===="+acceptAmount );
             if (acceptAmount.compareTo(BigDecimal.ZERO) == 0){
@@ -98,27 +99,27 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
     }
 
     //下单分账
-    public void payOrderAccept(OrderWaterDTO orderWaterDTO) {
+    public void payOrderAccept(OrderWaterDTO orderWaterDTO,OrderDetailDTO orderDetailDTO) {
         //订单id
-        Integer orderId = orderWaterDTO.getOrderId() == null ? 0 : orderWaterDTO.getOrderId();
+        Integer orderId = orderDetailDTO.getOrderId() == null ? 0 : orderDetailDTO.getOrderId();
         //订单号
-        String orderNo = orderWaterDTO.getOrderNo();
+        String orderNo = orderDetailDTO.getOrderNo();
         //用户id
-        Integer userId = orderWaterDTO.getUserId()  == null ? 0 : orderWaterDTO.getUserId();
+        Integer userId = orderDetailDTO.getUserId()  == null ? 0 : orderDetailDTO.getUserId();
 
-        Integer companyId = orderWaterDTO.getCompanyId()  == null ? 0 : orderWaterDTO.getCompanyId();
+        OrderRentVehicleDetail rentVehicleDetail = orderDetailDTO.getRentVehicleDetail();
 
-        log.info("分账----payOrderAccept----userId====" + userId + "---orderId===" + orderId + "---orderNo===" + orderNo+"----companyId==="+companyId);
 
-        List<OrderGoodsDTO> goodsDTOList = orderWaterDTO.getGoodsDTOList();
+        Integer companyId = rentVehicleDetail.getVehicleManageCompanyId() == null ? 0 : rentVehicleDetail.getVehicleManageCompanyId();
 
         log.info("分账----payOrderAccept----userId====" + userId + "---orderId===" + orderId + "---orderNo===" + orderNo+"----companyId==="+companyId);
 
-        if (orderId == 0  || userId == 0 || companyId == 0 || CollectionUtils.isEmpty(goodsDTOList)) {
+
+        if (orderId == 0  || userId == 0 || companyId == 0 ) {
             throw  new BaseException("分账----payOrderAccept----参数不能为空----orderId===" + orderId,ResultCode.FAILED_CODE);
         }
 
-        BigDecimal orderAmount = goodsDTOList.stream().map(OrderGoodsDTO::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal orderAmount = orderDetailDTO.getAcceptAmount();
 
         log.info("分账----payOrderAccept--------userId===" + userId + "---orderAmount===="+orderAmount);
 
@@ -273,12 +274,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                 log.info("订单完成分账----finishOrderAccept----id====" + id + "---commison==" + commison + "----divisionType===" + divisionType);
                 amount = amount.add(commison);
             }
-            Integer orderType = 0;
-            List<OrderGoodsDTO> goodsDTOList = orderWaterDTO.getGoodsDTOList();
-            if (goodsDTOList.size() > 0){
-                OrderGoodsDTO orderGoodsDTO=goodsDTOList.get(0);
-                orderType=orderGoodsDTO.getType() == null ? 0 : orderGoodsDTO.getType();
-            }
+            Integer orderType = orderDetailDTO.getOrderType() == null ? 0 : orderDetailDTO.getOrderType();
             BigDecimal unbooked = amount;
             log.info("订单完成分账----finishOrderWater----orderId====" + orderId + "---amount==" + amount + "---unbooked==" + unbooked);
             if (orderType == 1) {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WaterMQHandler.java

@@ -87,7 +87,7 @@ public class WaterMQHandler {
                             orderWaterDTO.setGoodsDTOList(
                                     new ArrayList<OrderGoodsDTO>() {{
                                         add(new OrderGoodsDTO() {{
-                                            setGoodId(orderMQDTO.getOrderRentVehicleDetail().getModelId());
+                                            setGoodId(orderMQDTO.getOrderRentVehicleDetail().getVehicleId());
                                             setGoodNumber(1);
                                             setImg(orderMQDTO.getPicture());
                                             setPrice(orderMQDTO.getItemByTypeEnum(ItemTypeEnum.VEHICLE_MODEL).getLastAmount());
@@ -103,7 +103,7 @@ public class WaterMQHandler {
                             orderWaterDTO.setGoodsDTOList(
                                     new ArrayList<OrderGoodsDTO>() {{
                                         add(new OrderGoodsDTO() {{
-                                            setGoodId(orderMQDTO.getOrderTourDetail().getGoodId());
+                                            setGoodId(orderMQDTO.getOrderTourDetail().getGoodId()+"");
                                             setGoodNumber(1);
                                             setImg(orderMQDTO.getPicture());
                                             setPrice(tourAdultItem.getRealAmount().add(null == tourChildItem?
@@ -118,7 +118,7 @@ public class WaterMQHandler {
                             orderWaterDTO.setGoodsDTOList(
                                     new ArrayList<OrderGoodsDTO>() {{
                                         add(new OrderGoodsDTO() {{
-                                            setGoodId(orderMQDTO.getOrderMemberDetail().getMemberLevelId());
+                                            setGoodId(orderMQDTO.getOrderMemberDetail().getMemberLevelId()+"");
                                             setGoodNumber(1);
                                             setImg(orderMQDTO.getPicture());
                                             setPrice(orderMQDTO.getItemByTypeEnum(ItemTypeEnum.MEMBER).getRealAmount());

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/OrderDetailDTO.java

@@ -35,10 +35,24 @@ public class OrderDetailDTO {
     private OrderRentVehicleDetail rentVehicleDetail;
 
 
+    @ApiModelProperty("订单类型")
+    private  Integer  orderType;
+
+
     @ApiModelProperty("订单号")
     private  String orderNo;
 
 
+
+    @ApiModelProperty("用户id")
+    private  Integer userId;
+
+
+
+    @ApiModelProperty("订单id")
+    private  Integer orderId;
+
+
     @ApiModelProperty("订单状态")
     private  Integer orderStatus = PAY;
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDetailBiz.java

@@ -94,6 +94,10 @@ public class OrderDetailBiz{
         orderDetailDTO.setRentVehicleDetail(vehicleDetail);
         orderDetailDTO.setDamageSafeAmount(damageSafeAmount);
         orderDetailDTO.setGoodsAmount(goodsAmount);
+        orderDetailDTO.setOrderType(baseOrder.getType());
+        orderDetailDTO.setOrderId(baseOrder.getId());
+        orderDetailDTO.setUserId(baseOrder.getUserId());
+        orderDetailDTO.setOrderNo(baseOrder.getNo());
         if (accountDetail !=  null){
             List<OrderAccountDeduction> deductions = accountDetail.getDeductions();
             if (CollectionUtils.isNotEmpty(deductions)){