fix

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelManageAccountData.java

@@ -22,7 +22,7 @@ import java.util.Date;
 		"left join groups_trips gt on gt.account_id = a.id " +
 		"left join groups_relation gr on gr.groups_id = gt.id " +
 		"left join goods_don_sku gdk on gdk.id = gt.sku_id",
-		groupBy = "a.id,g.id,a.bank_card,g.title,a.account,a.password,a.start_time,a.expiry_time,a.amount,a.cn_account,a.us_account,gt.id,a.remark,gdk.id,gdk.spec_val")
+		groupBy = "a.id,g.id,a.bank_card,g.title,a.account,a.password,a.api_key,a.start_time,a.expiry_time,a.amount,a.cn_account,a.us_account,gt.id,a.remark,gdk.id,gdk.spec_val")
 public class ExcelManageAccountData {
 
 	@ExcelIgnore
@@ -45,6 +45,10 @@ public class ExcelManageAccountData {
 	@DbField("a.password")
 	private String password;
 
+	@ExcelProperty("APIkey")
+	@DbField("a.api_key")
+	private String apiKey;
+
 	@ExcelProperty("银行卡号")
 	@DbField("a.bank_card")
 	private String bankCard;

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

@@ -19,7 +19,7 @@ import java.util.Date;
         "left join groups_trips gt on gt.account_id = a.id " +
         "left join groups_relation gr on gr.groups_id = gt.id " +
         "left join goods_don_sku gdk on gdk.id = gt.sku_id",
-        groupBy = "a.id,g.id,a.bank_card,g.title,a.account,a.password,a.start_time,a.expiry_time,a.amount,a.cn_account,a.us_account,gt.id,a.remark,gdk.id,gdk.spec_val,a.customer_service_id")
+        groupBy = "a.id,g.id,a.bank_card,g.title,a.account,a.password,a.api_key,a.start_time,a.expiry_time,a.amount,a.cn_account,a.us_account,gt.id,a.remark,gdk.id,gdk.spec_val,a.customer_service_id")
 public class AccountView {
 
     @DbField("a.id")
@@ -40,6 +40,9 @@ public class AccountView {
     @DbField("a.password")
     private String password;
 
+    @DbField("a.api_key")
+    private String apiKey;
+
     @DbField("a.start_time")
     private Date startTime;
 

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -61,10 +61,12 @@ public class GoodsDonController {
                     .orderByAsc(GoodsDonSku::getPrice)
                     .last("limit 1")
                     .select(GoodsDonSku::getPrice));
-            goods.setPrice(goodsDonSku.getPrice());
-            goods.setSoldNum(goods.getVirtualSold() + orderDonMapper.selectCount(Wrappers.lambdaQuery(OrderDon.class)
-                    .eq(OrderDon::getGoodsId, goods.getId())
-                    .notIn(OrderDon::getStatus, Constant.noOrderStatus)));
+            Optional.ofNullable(goodsDonSku).ifPresent(sku->{
+                goods.setPrice(goodsDonSku.getPrice());
+                goods.setSoldNum(goods.getVirtualSold() + orderDonMapper.selectCount(Wrappers.lambdaQuery(OrderDon.class)
+                        .eq(OrderDon::getGoodsId, goods.getId())
+                        .notIn(OrderDon::getStatus, Constant.noOrderStatus)));
+            });
         });
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }