Просмотр исходного кода

Merge branch 'information-27' into dev

zoujiajian 2 лет назад
Родитель
Сommit
8f2ca706de

+ 2 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/InformationClickUserRecord.java

@@ -15,4 +15,6 @@ public class InformationClickUserRecord extends BaseEntity{
     private Long goodsId;
     private Long goodsId;
 
 
     private Long infoId;
     private Long infoId;
+
+    private Long orderId;
 }
 }

+ 2 - 0
netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuSpec.java

@@ -46,5 +46,7 @@ public class ReqGoodsSkuSpec {
          * 原价
          * 原价
          */
          */
         private BigDecimal benefitsPrice;
         private BigDecimal benefitsPrice;
+
+        private BigDecimal deposit;
     }
     }
 }
 }

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

@@ -631,7 +631,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		if (payRequest.getInfoId() != null){
 		if (payRequest.getInfoId() != null){
 			InformationClickUserRecord informationClickUserRecord = new InformationClickUserRecord();
 			InformationClickUserRecord informationClickUserRecord = new InformationClickUserRecord();
 			informationClickUserRecord.setInfoId(payRequest.getInfoId());
 			informationClickUserRecord.setInfoId(payRequest.getInfoId());
-			informationClickUserRecord.setInfoId(orderDon.getId());
+			informationClickUserRecord.setOrderId(orderDon.getId());
 			informationClickUserRecordMapper.insert(informationClickUserRecord);
 			informationClickUserRecordMapper.insert(informationClickUserRecord);
 		}
 		}
 		return orderDon;
 		return orderDon;