fix

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

@@ -13,7 +13,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@SearchBean(tables = "(select * from goods_don where type = 1) g left join yh_shop_general_goods_rate yr on yr.goods_id = g.id")
+@SearchBean(tables = "(select * from goods_don where type = 1 and status is true and deleted is true) g left join yh_shop_general_goods_rate yr on yr.goods_id = g.id")
 public class ShopGeneralGoodsRateView {
 	@DbField("yr.id")
 	private Long id;

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsYhShopCommonServiceImpl.java

@@ -94,10 +94,10 @@ public class CmsYhShopCommonServiceImpl implements CmsYhShopCommonService {
 				.eq(YhShop::getUserId, yhShopApplyRecord.getUserId()).last("limit 1"));
 		Assert.notNull(yhShopApplyRecord, "开店申请记录不存在");
 		Assert.notNull(yhShop, "开店申请记录不存在");
-		if (yhShopApplyRecord.getVerifyStatus() != YhShopApplyRecord.Status.verify || yhShopApplyRecord.getVerifyStatus() != YhShopApplyRecord.Status.modify) {
+		if (yhShopApplyRecord.getVerifyStatus() != YhShopApplyRecord.Status.verify && yhShopApplyRecord.getVerifyStatus() != YhShopApplyRecord.Status.modify) {
 			throw BusinessRuntimeException.getInstance("该开店申请已审核");
 		}
-		if (verifyStatus != YhShopApplyRecord.Status.success || verifyStatus != YhShopApplyRecord.Status.fail) {
+		if (verifyStatus != YhShopApplyRecord.Status.success && verifyStatus != YhShopApplyRecord.Status.fail) {
 			throw BusinessRuntimeException.getInstance("请选择正确的审核状态");
 		}
 		if (verifyStatus == YhShopApplyRecord.Status.fail) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/shop/CmsYhShopGoodsController.java

@@ -123,7 +123,7 @@ public class CmsYhShopGoodsController {
     /**
      * 设置店铺平台通用 分销比例配置
      */
-    @PutMapping("/set/distribute/general/goods//rate")
+    @PutMapping("/set/distribute/general/goods/rate")
     public Result<String> setGeneralGoodsRate(@RequestBody List<YhShopGeneralGoodsRate> rates) {
         cmsYhShopCommonService.setGeneralGoodsRate(rates);
         return GatewayResponse.SUCCESS.newBuilder().toResult();