123

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderPulishReceiveDetail.java

+package com.xxfc.platform.order.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+
+/**
+ * 订单需求接单详情表
+ * 
+ * @author hezhen
+ * @email 18178966185@163.com
+ * @date 2019-09-09 15:51:16
+ */
+@Data
+@Table(name = "order_pulish_receive_detail")
+public class OrderPulishReceiveDetail implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+
+    @Column(name = "order_id")
+	@ApiModelProperty(value = "订单id")
+    private Integer orderId;
+	
+
+    @Column(name = "company_id")
+	@ApiModelProperty(value = "公司id")
+    private Integer companyId;
+
+
+	@Column(name = "publish_id")
+	@ApiModelProperty(value = "需求id")
+	private Integer publishId;
+	
+
+
+    @Column(name = "type")
+	@ApiModelProperty(value = "类型：1-接单者；2-发布者")
+    private Integer type;
+	
+
+
+    @Column(name = "receive_ids")
+	@ApiModelProperty(value = "接单ids(逗号隔开)")
+    private String receiveIds;
+	
+
+}

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

+package com.xxfc.platform.order.pojo.order;
+
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderItem;
+import com.xxfc.platform.order.entity.OrderPulishReceiveDetail;
+import com.xxfc.platform.order.entity.inter.OrderDetail;
+import com.xxfc.platform.vehicle.entity.VehiclePublishGoods;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PulishReceiveBO extends OrderPulishReceiveDetail implements OrderDetail {
+    private BaseOrder order;
+    private VehiclePublishGoods vehiclePublishGoods;
+    AppUserDTO appUserDTO;
+    /**
+     * 促成人联系方式
+     */
+    @ApiModelProperty(value = "促成人联系方式")
+    String facilitatePhone;
+
+    /**
+     * 下单来源，1--app；2--小程序
+     */
+    private Integer orderOrigin;
+
+    /**
+     * 优惠券*
+     */
+    private List<String> tickerNo;
+
+    /**
+     * 订单子项
+     */
+    List<OrderItem> items;
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddPublishReceiveDTO.java

+package com.xxfc.platform.order.pojo.order.add;
+
+
+import com.xxfc.platform.order.entity.OrderPulishReceiveDetail;
+import com.xxfc.platform.vehicle.entity.VehiclePublishReceive;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 16:27
+ */
+@Data
+public class AddPublishReceiveDTO extends OrderPulishReceiveDetail {
+
+
+
+
+    @ApiModelProperty("接单用户Id")
+    private Integer  userId;
+
+
+
+
+    @ApiModelProperty("接单详情")
+    List<VehiclePublishReceive> receives;
+
+
+}

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

+package com.xxfc.platform.order.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.order.entity.OrderPulishReceiveDetail;
+import com.xxfc.platform.order.mapper.OrderPulishReceiveDetailMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * 
+ *
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-19 17:00:35
+ */
+@Service
+public class OrderPulishReceiveDetailDetailBiz extends BaseBiz<OrderPulishReceiveDetailMapper, OrderPulishReceiveDetail> {
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderPulishReceiveDetailMapper.java

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.OrderPulishReceiveDetail;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-19 17:00:35
+ */
+public interface OrderPulishReceiveDetailMapper extends Mapper<OrderPulishReceiveDetail> {
+	
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderPulishReceiveService.java

+package com.xxfc.platform.order.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.activity.feign.ActivityFeign;
+import com.xxfc.platform.order.biz.*;
+import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.entity.OrderItem;
+import com.xxfc.platform.order.pojo.order.MemberBO;
+import com.xxfc.platform.order.pojo.order.PulishReceiveBO;
+import com.xxfc.platform.order.pojo.price.OrderPriceVO;
+import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import lombok.extern.log4j.Log4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+
+@Service
+@Log4j
+public class OrderPulishReceiveService extends AbstractOrderHandle<OrderPulishReceiveDetailDetailBiz, PulishReceiveBO> implements UserRestInterface {
+
+
+    @Autowired
+    VehicleFeign vehicleFeign;
+
+    @Autowired
+    ThirdFeign thirdFeign;
+
+    @Autowired
+    private BaseOrderBiz baseOrderBiz;
+
+    @Autowired
+    private UserFeign userFeign;
+
+
+    private static Integer IS_CHILD = 1;
+    private static Integer LEVEL_DEFAULT = 0;
+    private static Integer NUMBER_ZERO = 0;
+    private static Long autoCancelTime;
+
+    @Autowired
+    OrderCostDetailBiz orderCostDetailBiz;
+
+    @Autowired
+    OrderTemplateBiz orderTemplateBiz;
+
+    @Autowired
+    protected UserAuthConfig userAuthConfig;
+
+    @Autowired
+    ActivityFeign activityFeign;
+
+    @Autowired
+    public HttpServletRequest request;
+
+    private SimpleDateFormat simleFormatter = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss");
+
+    private  DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("YYYYMMddHHmmss");
+
+    @PostConstruct
+    public void init() {
+        this.channel = null;
+        this.orderTypeEnum = OrderTypeEnum.MEMBER;
+    }
+
+    public void initDictionary() {
+        dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        this.autoCancelTime = Long.valueOf(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ACT_MEMBER).getDetail());
+    }
+
+
+
+    @Override
+    public void handleDetail(PulishReceiveBO bo) {
+        //设置订单状态为3
+        bo.getOrder().setStatus(OrderStatusEnum.ORDER_UNPAY.getCode());
+        //设置订单图片
+        bo.getOrder().setPicture(bo.getVehiclePublishGoods().getCover());
+        //设置订单名称
+       // bo.getOrder().setName(bo.getVehiclePublishGoods().getName());
+
+        super.handleDetail(bo);
+
+        //发送定时取消订单(30分钟)
+        rabbitProduct.sendDelayMessage(bo.getOrder(), autoCancelTime);
+    }
+
+    @Override
+    public void handleCalculate(PulishReceiveBO bo) {
+        OrderPriceVO tpv = calculatePrice(bo);
+        BeanUtil.copyProperties(tpv, bo.getOrder());
+        BeanUtil.copyProperties(tpv, bo);
+    }
+
+    @Override
+    public OrderPriceVO calculatePrice(PulishReceiveBO detail) {
+        BigDecimal orderAmount = BigDecimal.ZERO;
+        BigDecimal goodsAmount = BigDecimal.ZERO;
+        BigDecimal realAmount = BigDecimal.ZERO;
+        BigDecimal couponAmount = BigDecimal.ZERO;
+
+        //设置Item
+       /* OrderItem memberOrderItem = orderItemBiz.initOrderItem(detail.getBaseUserMemberLevel().getPrice(), 1, detail.getBaseUserMemberLevel().getName(), detail.getBaseUserMemberLevel().getId() + "", ItemTypeEnum.MEMBER);
+
+        detail.setItems(new ArrayList<OrderItem>());
+        detail.getItems().add(memberOrderItem);*/
+
+        //商品价格
+        //goodsAmount = goodsAmount.add(memberOrderItem.getCalculateAmount(Boolean.TRUE));
+
+      /*  //vehicleAmount 优惠券处理
+        if (null != detail.getTickerNo() && detail.getTickerNo().size() > 0) {
+            couponAmount = activityFeign.use(detail.getOrder().getUserId(), detail.getTickerNo(), detail.getOrder().getNo(), channel, goodsAmount, ActivityFeign.TYPE_NO_USE);
+            if (couponAmount.compareTo(BigDecimal.ZERO) > 0) {
+                detail.getOrder().setCouponTickerNos(detail.getTickerNo().stream().collect(Collectors.joining(",")));
+                detail.getOrder().setHasDiscount(SYS_TRUE);
+                memberOrderItem.handleCouponAmount(couponAmount);
+            }
+        }*/
+
+        //订单总价格
+        orderAmount = orderAmount.add(goodsAmount);
+        //真实价格
+        realAmount = realAmount.add(orderAmount).subtract(couponAmount);
+
+        //生成订单明细
+        OrderPriceVO opv = new OrderPriceVO();
+        opv.setOrderAmount(orderAmount);
+        opv.setGoodsAmount(goodsAmount);
+        opv.setRealAmount(realAmount);
+        opv.setCouponAmount(couponAmount);
+
+        return opv;
+    }
+}

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehiclePublishReceiveDTO.java

+package com.xxfc.platform.vehicle.pojo.dto;
+
+
+import com.xxfc.platform.vehicle.entity.VehiclePublishReceive;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 16:27
+ */
+@Data
+public class VehiclePublishReceiveDTO{
+
+
+    @ApiModelProperty("需求Id")
+    private Integer  publishId;
+
+
+
+    @ApiModelProperty("类型：1-接单者；2-发布者")
+    private Integer  type;
+
+
+    @ApiModelProperty("接单公司Id")
+    private Integer  companyId;
+
+
+    @ApiModelProperty("接单用户Id")
+    private Integer  userId;
+
+
+    @ApiModelProperty("接单详情")
+    List<VehiclePublishReceive> receives;
+
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishBiz.java

@@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -37,6 +38,8 @@ public class VehiclePublishBiz extends BaseBiz<VehiclePublishMapper, VehiclePubl
     ConfigFeign configFeign;
 
 
+
+    @Transactional(rollbackFor = Exception.class)
     public  void  addOrUpd(VehiclePublish vehiclePublish){
         List<VehiclePublishGoods> goodsList = vehiclePublish.getPublishGoodsList();
         if (CollectionUtils.isEmpty(goodsList)){

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

@@ -3,10 +3,17 @@ package com.xxfc.platform.vehicle.biz;
 
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.vehicle.entity.VehiclePublishReceive;
 import com.xxfc.platform.vehicle.mapper.VehiclePublishReceiveMapper;
+import com.xxfc.platform.vehicle.pojo.dto.VehiclePublishReceiveDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 
 @Service
@@ -15,6 +22,21 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
 
 
 
+    @Transactional(rollbackFor = Exception.class)
+    public  void  receive(VehiclePublishReceiveDTO publishReceiveDTO){
+        if (publishReceiveDTO == null || CollectionUtils.isEmpty(publishReceiveDTO.getReceives())){
+            throw  new BaseException("参数不能为空", ResultCode.FAILED_CODE);
+        }
+        List<VehiclePublishReceive> receives = publishReceiveDTO.getReceives();
+        for (VehiclePublishReceive vehiclePublishReceive : receives){
+
+        }
+
+
+    }
+
+
+