fix 订单

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonView.java

@@ -22,8 +22,7 @@ import java.util.List;
 @Getter
 @Setter
 @SearchBean(tables = "order_don o left join goods_don_sku sku on o.sku_id = sku.id " +
-        "left join goods_don g on g.id = o.goods_id " +
-        "left join order_don_transport odt on odt.order_id = o.id")
+        "left join goods_don g on g.id = o.goods_id ")
 public class OrderDonView {
 
     @DbField("o.id")
@@ -113,42 +112,6 @@ public class OrderDonView {
     @DbField("o.pay_title")
     private String payTitle;
 
-    /**
-     * 收货人
-     */
-    @DbField("odt.receiver")
-    private String receiver;
-
-    /**
-     * 手机号
-     */
-    @DbField("odt.phone")
-    private String phone;
-
-    /**
-     * 省份
-     */
-    @DbField("odt.province")
-    private String province;
-
-    /**
-     * 城市
-     */
-    @DbField("odt.city")
-    private String city;
-
-    /**
-     * 区/县
-     */
-    @DbField("odt.district")
-    private String district;
-
-    /**
-     * 详细地址
-     */
-    @DbField("odt.address")
-    private String address;
-
     @DbField("g.special_type")
     private GoodsDon.SpecialType specialType;
 

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderMasterDonView.java

@@ -95,6 +95,9 @@ public class OrderMasterDonView {
 	@DbField("o.yhs_id")
 	private Long yhsId;
 
+	@DbField("o.status")
+	private OrderMasterDon.Status status;
+
 	@DbIgnore
 	private OrderDonWaybill waybill;
 

netflix-service/src/main/java/com/cyksj/service/market/impl/MarketFrontServiceImpl.java

@@ -25,6 +25,7 @@ import com.cyksj.mapper.market.sign.UserPointsRecordMapper;
 import com.cyksj.mapper.market.task.TaskFollowPlatVerifyMapper;
 import com.cyksj.mapper.market.task.TaskUserCompleteRecordMapper;
 import com.cyksj.mapper.market.task.UserBindDetailMapper;
+import com.cyksj.mapper.order.OrderMasterDonMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.manage.views.GroupsRelationView;
 import com.cyksj.model.request.LuckyDrawReq;
@@ -79,6 +80,8 @@ public class MarketFrontServiceImpl implements MarketFrontService {
 
 	private final OrderDonMapper orderDonMapper;
 
+	private final OrderMasterDonMapper orderMasterDonMapper;
+
 	private final AddressMapper addressMapper;
 
 	private final OrderDonTransportMapper orderDonTransportMapper;
@@ -657,11 +660,7 @@ public class MarketFrontServiceImpl implements MarketFrontService {
 			throw new BusinessRuntimeException("请添加收货地址.");
 		}
 		User user = userMapper.selectById(userId);
-		/* 生成订单 */
-		String donNo = SEQUENCE.nextId().toString();
 		OrderDon orderDon = new OrderDon();
-		orderDon.setOrderNo(donNo);
-		orderDon.setOpenId(user.getOpenId());
 		BigDecimal zero = BigDecimal.ZERO;
 		orderDon.setMoney(zero);
 		orderDon.setRealMoney(zero);
@@ -672,6 +671,15 @@ public class MarketFrontServiceImpl implements MarketFrontService {
 		orderDon.setStatus(record.getType() == LuckyDraw.Type.realGoods ? OrderDon.Status.hasPayment : OrderDon.Status.complete);
 		orderDon.setUserId(user.getId());
 		orderDon.setType(OrderDon.Type.LOTTERY);
+
+		OrderMasterDon orderMasterDon = new OrderMasterDon();
+		orderMasterDon.setUserId(user.getId());
+		orderMasterDon.setMoney(orderDon.getMoney());
+		orderMasterDon.setStatus(OrderMasterDon.Status.hasPayment);
+		orderMasterDon.setType(OrderMasterDon.Type.LOTTERY);
+		orderMasterDonMapper.insert(orderMasterDon);
+
+		orderDon.setMOid(orderMasterDon.getId());
 		orderDonMapper.insert(orderDon);
 
 		Address address = addressMapper.selectById(addressId);

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -541,7 +541,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 
 		if (Constant.realGoodsType.contains(goodsDon.getType()) && !goodsDon.getId().equals(27l)) {
-			saveTransport(payRequest.getAddressId(), orderDon.getId());
+			saveTransport(payRequest.getAddressId(), orderMasterDon.getId());
 		}
 		//保存加购发货地址
 		if (orderDon.getIsDp() && payRequest.getAddressId() != null) {
@@ -1721,7 +1721,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 										}
 									}
 									//生成实物订单 0元实物订单
-									createRealOrderAndTransport(order.getUserId(), address, plus_goods, plus_sku, plus_order_ids);
+									createRealOrderAndTransport(order.getUserId(), address, plus_goods, plus_sku, plus_order_ids, order.getYhsId());
 									continue;
 								}
 								if (dis_relation_ids == null) {
@@ -2858,7 +2858,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 	/**
 	 * 生成实物订单
 	 */
-	public void createRealOrderAndTransport(Long userId, Address address, GoodsDon goodsDon, GoodsDonSku sku, List<Long> plusOrderIds) {
+	public void createRealOrderAndTransport(Long userId, Address address, GoodsDon goodsDon, GoodsDonSku sku, List<Long> plusOrderIds, Long yhsId) {
 		OrderDon orderDon = new OrderDon();
 		orderDon.setUserId(userId);
 		orderDon.setRelationId(0l);
@@ -2868,6 +2868,18 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setGoodsId(goodsDon.getId());
 		orderDon.setPayTitle(goodsDon.getTitle() + sku.getSpecVal());
 		orderDon.setStatus(OrderDon.Status.hasPayment);
+		orderDon.setYhsId(yhsId);
+
+		OrderMasterDon orderMasterDon = new OrderMasterDon();
+		orderMasterDon.setYhsId(yhsId);
+		orderMasterDon.setUserId(userId);
+		orderMasterDon.setMoney(orderDon.getMoney());
+		orderMasterDon.setIsDp(true);
+		orderMasterDon.setPayTitle(orderDon.getPayTitle());
+		orderMasterDon.setStatus(OrderMasterDon.Status.hasPayment);
+		orderMasterDonService.save(orderMasterDon);
+
+		orderDon.setMOid(orderMasterDon.getId());
 		orderDonMapper.insert(orderDon);
 		//处理收货地址
 		saveTransportByAddress(address, orderDon.getId());