fix 商户每日限单数展示

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

@@ -74,4 +74,18 @@ public class ShopConfig extends BaseEntity{
      * 支付主体
      */
     private String payment;
+
+    /**
+     * 每日限单数
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private Integer dayLimitOrders;
+
+    /**
+     * 限单是否启用
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private Boolean dayLimitStatus;
 }

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

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author chan
@@ -44,12 +45,19 @@ public class ShopConfigController {
     private final ZfbShopOrderDayLimitMapper zfbShopOrderDayLimitMapper;
 
     @GetMapping
-    public Result<SearchResult<ShopConfig>> get(){
-        SearchResult<ShopConfig> searchResult = beanSearcher.search(ShopConfig.class, MapUtils.flatBuilder(request.getParameterMap()).build());
-        searchResult.getDataList().forEach((shopConfig)->{
-            shopConfig.setChannelCount(channelService.count(Wrappers.lambdaQuery(Channel.class).eq(Channel::getWxShopId,shopConfig.getAppId()).or().eq(Channel::getZfbShopId,shopConfig.getAppId())));
-        });
-        return GatewayResponse.SUCCESS.newBuilder().toResult(searchResult);
+    public Result<SearchResult<ShopConfig>> get() {
+	    SearchResult<ShopConfig> searchResult = beanSearcher.search(ShopConfig.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+	    searchResult.getDataList().forEach((shopConfig) -> {
+		    shopConfig.setChannelCount(channelService.count(Wrappers.lambdaQuery(Channel.class).eq(Channel::getWxShopId, shopConfig.getAppId()).or().eq(Channel::getZfbShopId, shopConfig.getAppId())));
+
+		    Optional.ofNullable(zfbShopOrderDayLimitMapper.selectOne(Wrappers.lambdaQuery(ZfbShopOrderDayLimit.class)
+				    .eq(ZfbShopOrderDayLimit::getAppId, shopConfig.getAppId())
+				    .last("limit 1"))).ifPresent(limit -> {
+			    shopConfig.setDayLimitOrders(limit.getDayLimitOrders());
+			    shopConfig.setDayLimitStatus(limit.getStatus());
+		    });
+	    });
+	    return GatewayResponse.SUCCESS.newBuilder().toResult(searchResult);
     }
 
     @PostMapping