|
@@ -14,6 +14,7 @@ import com.cyksj.model.GoodsWholesaleUserRequirementRecord;
|
|
|
import com.cyksj.model.entity.GoodsWholesale;
|
|
import com.cyksj.model.entity.GoodsWholesale;
|
|
|
import com.cyksj.model.entity.GoodsWholesaleUserDeposit;
|
|
import com.cyksj.model.entity.GoodsWholesaleUserDeposit;
|
|
|
import com.cyksj.model.views.GoodsWholesaleOrderView;
|
|
import com.cyksj.model.views.GoodsWholesaleOrderView;
|
|
|
|
|
+import com.cyksj.model.views.GoodsWholesaleView;
|
|
|
import com.cyksj.service.goods.GoodsWholesaleService;
|
|
import com.cyksj.service.goods.GoodsWholesaleService;
|
|
|
import com.cyksj.service.user.UserBindRelationService;
|
|
import com.cyksj.service.user.UserBindRelationService;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
@@ -89,8 +90,8 @@ public class CmsGoodsDonWholeSaleController {
|
|
|
* 批发平台列表
|
|
* 批发平台列表
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/get")
|
|
@GetMapping("/get")
|
|
|
- public Result<SearchResult<GoodsWholesale>> getWholesale() {
|
|
|
|
|
- SearchResult<GoodsWholesale> search = beanSearcher.search(GoodsWholesale.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
|
|
|
|
|
+ public Result<SearchResult<GoodsWholesaleView>> getWholesale() {
|
|
|
|
|
+ SearchResult<GoodsWholesaleView> search = beanSearcher.search(GoodsWholesaleView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
|
search.getDataList().forEach(data->{
|
|
search.getDataList().forEach(data->{
|
|
|
try {
|
|
try {
|
|
|
data.setWholesaleConfig(Jsons.parseList(data.getConfig(), GoodsWholesale.GoodsWholesaleConfig.class));
|
|
data.setWholesaleConfig(Jsons.parseList(data.getConfig(), GoodsWholesale.GoodsWholesaleConfig.class));
|