fix 首页配置关联订单

netflix-dao/src/main/java/com/cyksj/model/entity/HomeManagementConfigOrderRecord.java

@@ -14,5 +14,8 @@ import lombok.Setter;
 public class HomeManagementConfigOrderRecord {
 	private Long configId;
 
-	private Long mOid;
+	/**
+	 * 子订单id
+	 */
+	private Long orderId;
 }

netflix-dao/src/main/java/com/cyksj/model/request/OrderPayRequest.java

@@ -153,4 +153,9 @@ public class OrderPayRequest {
     private Long shopCartId;
 
     private BigDecimal galaxycoin;
+
+    /**
+     * 首页管理配置id
+     */
+    private Long hmConfigId;
 }

netflix-dao/src/main/java/com/cyksj/model/request/ShoppingCartDonReq.java

@@ -18,6 +18,8 @@ public class ShoppingCartDonReq {
 
 	private Long goodsId;
 
+	private Long hmConfigId;
+
 	private Long skuId;
 
 	private Integer num;

netflix-dao/src/main/java/com/cyksj/model/request/UnifiedOrderPayReq.java

@@ -48,11 +48,6 @@ public class UnifiedOrderPayReq {
 	 */
 	private Long addressId;
 
-	/**
-	 * 首页管理配置id
-	 */
-	private Long hmConfigId;
-
 	/**
 	 * 购买商品
 	 */

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

@@ -52,7 +52,7 @@ public class HomeManagementConfigView {
 	@DbField("select count(*) from home_management_config_user_click_record hcr where hcr.config_id = hc.id")
 	private Integer click;
 
-	@DbField("select count(*) from home_management_config_order_record hor left join order_master_don mo on mo.id = hor.m_oid where mo.status not in ('close','noPayment')")
+	@DbField("select count(*) from home_management_config_order_record hor left join order_don o on mo.id = hor.order_id where o.status not in ('close','noPayment')")
 	private Integer orderNum;
 
 	@DbField("hc.created_time")

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

@@ -43,6 +43,9 @@ public class ShoppingCartDonView {
 	@DbField("sc.is_specific_price")
 	private Boolean isSpecificPrice;
 
+	@DbField("sc.hm_config_id")
+	private Long hmConfigId;
+
 	@DbField("sc.created_time")
 	private Date createdTime;
 }

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

@@ -847,6 +847,14 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			totalPayTitle.append(payTitle);
 			this.saveOrUpdate(orderDon);
 
+			//记录通过首页配置 下单记录
+			if (payRequest.getHmConfigId() != null) {
+				HomeManagementConfigOrderRecord homeManagementConfigOrderRecord = new HomeManagementConfigOrderRecord();
+				homeManagementConfigOrderRecord.setConfigId(payRequest.getHmConfigId());
+				homeManagementConfigOrderRecord.setOrderId(orderDon.getId());
+				homeManagementConfigOrderRecordMapper.insert(homeManagementConfigOrderRecord);
+			}
+
 			if (orderDon.getIsDp()) {
 				//保存订单优惠加购规格 关系
 				OrderDiscountPlusPurchaseSkuRelation orderDiscountPlusPurchaseSkuRelation = new OrderDiscountPlusPurchaseSkuRelation();
@@ -956,14 +964,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		if (CollUtil.isNotEmpty(shopCartIds)) {
 			shoppingCartDonMapper.deleteBatchIds(shopCartIds);
 		}
-
-		//记录通过首页配置 下单记录
-		if (unifiedOrderPayReq.getHmConfigId() != null) {
-			HomeManagementConfigOrderRecord homeManagementConfigOrderRecord = new HomeManagementConfigOrderRecord();
-			homeManagementConfigOrderRecord.setConfigId(unifiedOrderPayReq.getHmConfigId());
-			homeManagementConfigOrderRecord.setMOid(orderMasterDon.getId());
-			homeManagementConfigOrderRecordMapper.insert(homeManagementConfigOrderRecord);
-		}
 		return orderMasterDon;
 	}