订单商品购前须知

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

@@ -19,6 +19,11 @@ public class GoodsClickUserOrderRecord extends BaseEntity{
 
 	private EnvType envType;
 
+    /**
+     * 商品购买前须知
+     */
+    private String purchaseNotify;
+
 	@Getter
 	@AllArgsConstructor
 	public enum EnvType {

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

@@ -225,6 +225,12 @@ public class OrderDonBackView {
 	@DbField("o.sub_node")
 	private String subNode;
 
+    /**
+     * 购前须知
+     */
+    @DbIgnore
+    private String purchaseNotify;
+
 	/**
 	 * 收货人
 	 */

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

@@ -224,6 +224,11 @@ public class OrderPayRequest {
      */
     private Boolean isRenewPrice = false;
 
+    /**
+     * 购前须知
+     */
+    private String purchaseNotify;
+
     @Getter
     public enum RenewSource{
         galaxyCoin("银河币"),

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

@@ -891,7 +891,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		//记录用户镜像店铺订单
 		recordUserMirrorShopOrderRelate(orderId, payRequest.getUserId(), payRequest.getCmt(), payRequest.getCustomId());
 		//记录用户环境下单数据
-		recordEnvTypeOrderRelate(orderId, payRequest.getGoodsId(), payRequest.getEnvType());
+        recordEnvTypeOrderRelate(orderId, payRequest.getGoodsId(), payRequest.getEnvType(), payRequest.getPurchaseNotify());
 		//记录银河币新入口续费数据
 		recordOrderDonGalaxyCoinRenewRelate(orderId, payRequest.getRenewSource());
 	}
@@ -927,15 +927,16 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 	}
 
-	private void recordEnvTypeOrderRelate(Long orderId, Long goodsId, GoodsClickUserOrderRecord.EnvType envType) {
-		if (goodsId != null && envType != null) {
-			GoodsClickUserOrderRecord goodsClickUserOrderRecord = new GoodsClickUserOrderRecord();
-			goodsClickUserOrderRecord.setGoodsId(goodsId);
-			goodsClickUserOrderRecord.setOrderId(orderId);
-			goodsClickUserOrderRecord.setEnvType(envType);
-			goodsClickUserOrderRecordMapper.insert(goodsClickUserOrderRecord);
-		}
-	}
+    private void recordEnvTypeOrderRelate(Long orderId, Long goodsId, GoodsClickUserOrderRecord.EnvType envType, String purchaseNotify) {
+        if (goodsId != null && envType != null) {
+            GoodsClickUserOrderRecord goodsClickUserOrderRecord = new GoodsClickUserOrderRecord();
+            goodsClickUserOrderRecord.setGoodsId(goodsId);
+            goodsClickUserOrderRecord.setOrderId(orderId);
+            goodsClickUserOrderRecord.setEnvType(envType);
+            goodsClickUserOrderRecord.setPurchaseNotify(purchaseNotify);
+            goodsClickUserOrderRecordMapper.insert(goodsClickUserOrderRecord);
+        }
+    }
 
 	private void recordOrderDonGalaxyCoinRenewRelate(Long orderId, OrderPayRequest.RenewSource renewSource) {
 		if (renewSource != null && renewSource == OrderPayRequest.RenewSource.galaxyCoin) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -145,6 +145,8 @@ public class CmsOrderController {
 
 	private final OrderDonAfterSalesRecordMapper orderDonAfterSalesRecordMapper;
 
+    private final GoodsClickUserOrderRecordMapper goodsClickUserOrderRecordMapper;
+
 	private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
 
 	@GetMapping("/get")
@@ -358,6 +360,10 @@ public class CmsOrderController {
 					data.setDeductMoney(claudeCodeDeductOrderRelate.getDeductMoney());
 				}
 			}
+            //购买须知
+            Optional.ofNullable(goodsClickUserOrderRecordMapper.selectOne(Wrappers.lambdaQuery(GoodsClickUserOrderRecord.class).eq(GoodsClickUserOrderRecord::getOrderId, data.getId()).last("limit 1"))).ifPresent(c -> {
+                data.setPurchaseNotify(c.getPurchaseNotify());
+            });
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}