余额

src/main/java/com/izouma/jiashanxia/domain/User.java

@@ -73,15 +73,25 @@ public class User extends BaseEntity implements Serializable {
 
     private String email;
 
+    @ApiModelProperty(value = "可提现收益")
     private BigDecimal amount;
 
+    @ApiModelProperty(value = "暂存")
+    private BigDecimal cacheAmount;
+
+    @ApiModelProperty(value = "分销")
+    private BigDecimal distribution;
+
+    @ApiModelProperty(value = "再分销")
+    private BigDecimal redistribution;
+
     private Long parent;
 
     @ApiModelProperty(value = "企业id")
     private Long companyId;
 
     @ApiModelProperty(value = "是否团队创始人")
-    private Boolean  teamFounder;
+    private Boolean teamFounder;
 
     @ApiModelProperty("是否微信授权")
     private boolean wxAuthorized;

src/main/java/com/izouma/jiashanxia/repo/GoodsInfoRepo.java

@@ -7,10 +7,13 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface GoodsInfoRepo extends JpaRepository<GoodsInfo, Long>, JpaSpecificationExecutor<GoodsInfo> {
     @Query("update GoodsInfo t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    List<GoodsInfo> findAllByAttractionsId(Long attractionsId);
 }

src/main/java/com/izouma/jiashanxia/web/GoodsInfoController.java

@@ -11,6 +11,7 @@ import com.izouma.jiashanxia.exception.BusinessException;
 import com.izouma.jiashanxia.repo.GoodsInfoRepo;
 import com.izouma.jiashanxia.utils.ObjUtils;
 import com.izouma.jiashanxia.utils.excel.ExcelUtils;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -80,5 +81,11 @@ public class GoodsInfoController extends BaseController {
         List<GoodsInfo> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    @PostMapping("/byAttractions")
+    @ApiOperation("按景区查找商品")
+    public List<GoodsInfo> byAttractions(@RequestParam Long attractionsId) {
+        return goodsInfoRepo.findAllByAttractionsId(attractionsId);
+    }
 }
 

src/main/vue/src/components/PackageGoodsTable.vue

@@ -71,7 +71,8 @@ export default {
                 ]
             },
             goodsList: [],
-            goods: {}
+            goods: {},
+            attractionsId: ''
         };
     },
     computed: {