|
|
@@ -7,7 +7,9 @@ import com.dgtly.common.core.controller.ApiBaseController;
|
|
|
import com.dgtly.common.core.domain.AjaxResult;
|
|
|
import com.dgtly.common.core.domain.ParameterObject;
|
|
|
import com.dgtly.common.core.domain.ResultType;
|
|
|
+import com.dgtly.companyext.domain.CompanyHonour;
|
|
|
import com.dgtly.companyext.domain.CompanyReviewed;
|
|
|
+import com.dgtly.companyext.service.ICompanyHonourService;
|
|
|
import com.dgtly.companyext.service.ICompanyReviewedService;
|
|
|
import com.dgtly.member.domain.MemberFollow;
|
|
|
import com.dgtly.member.service.IMemberFollowService;
|
|
|
@@ -42,6 +44,8 @@ public class SysCompanyController extends ApiBaseController {
|
|
|
@Autowired
|
|
|
private ICompanyReviewedService companyReviewedService;
|
|
|
@Autowired
|
|
|
+ private ICompanyHonourService companyHonourService;
|
|
|
+ @Autowired
|
|
|
private ISysDictDataService dictDataService;
|
|
|
|
|
|
@ApiOperation(value = "商家详情")
|
|
|
@@ -56,6 +60,9 @@ public class SysCompanyController extends ApiBaseController {
|
|
|
|
|
|
String companyTypeName = dictDataService.selectDictLabel("company_type",sysCompany.getCompanyType());
|
|
|
|
|
|
+ CompanyHonour ch = new CompanyHonour();
|
|
|
+ ch.setCompanyId(companyId);
|
|
|
+ List<CompanyHonour> chs = companyHonourService.selectCompanyHonourList(ch);
|
|
|
|
|
|
|
|
|
int isFollow = 0;
|
|
|
@@ -75,7 +82,7 @@ public class SysCompanyController extends ApiBaseController {
|
|
|
}
|
|
|
if(sysCompany!=null){
|
|
|
return AjaxResult.success(sysCompany).putKV("isFollow",isFollow)
|
|
|
- .putKV("companyTypeName",companyTypeName);
|
|
|
+ .putKV("companyTypeName",companyTypeName).putKV("companyHonours",chs);
|
|
|
}else{
|
|
|
return AjaxResult.error(ResultType.NUll);
|
|
|
}
|
|
|
@@ -90,6 +97,17 @@ public class SysCompanyController extends ApiBaseController {
|
|
|
return AjaxResult.success().putKV("list",goodsInfos);
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation(value = "商家列表")
|
|
|
+ @ApiImplicitParam(name = "params" , paramType = "body")
|
|
|
+ @PostMapping("/list")
|
|
|
+ public Object getList(){
|
|
|
+ ParameterObject obj = getParameterObject();
|
|
|
+ startPage(obj);
|
|
|
+ SysCompany sc = obj.parseBean(SysCompany.class);
|
|
|
+ List<SysCompany> scs = companyService.selectSysCompanyListExRoot(sc);
|
|
|
+ return AjaxResult.success(getDataTable(scs));
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
@ApiOperation(value = "商家入驻")
|
|
|
@ApiImplicitParam(name = "params" , paramType = "body")
|
|
|
@@ -117,4 +135,6 @@ public class SysCompanyController extends ApiBaseController {
|
|
|
return toAjax(i);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
}
|
