更新

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/merchant/MerchantFieldAppliesController.java

@@ -9,8 +9,12 @@ import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.ShiroUtils;
 import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldAppliesAdminService;
+import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldsAdminService;
 import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldApplyListParam;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
+import com.liquidnet.service.merchant.entity.MerchantFields;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -27,6 +31,9 @@ public class MerchantFieldAppliesController extends BaseController {
 
     private final String prefix = "zhengzai/kylin/field";
 
+    @Autowired
+    IMerchantFieldsAdminService merchantFieldsAdminService;
+
     @Autowired
     IMerchantFieldAppliesAdminService merchantFieldAppliesAdminService;
 
@@ -65,7 +72,20 @@ public class MerchantFieldAppliesController extends BaseController {
         LambdaQueryWrapper<MerchantFieldApplies> fieldAppliesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantFieldApplies.class);
         fieldAppliesLambdaQueryWrapper.eq(MerchantFieldApplies::getFieldApplyId, fieldApplyId);
         MerchantFieldApplies fieldApplies = merchantFieldAppliesAdminService.getOne(fieldAppliesLambdaQueryWrapper);
-        mmap.put("fieldApplyInfo", fieldApplies);
+
+        MerchantFieldAppliesVo fieldAppliesVo = MerchantFieldAppliesVo.getNew();
+        fieldAppliesVo.copy(fieldApplies);
+        if (fieldAppliesVo.getApplyType().equals("claim")) {
+            LambdaQueryWrapper<MerchantFields> fieldsLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantFields.class);
+            fieldsLambdaQueryWrapper.eq(MerchantFields::getFieldId, fieldAppliesVo.getFieldId());
+            MerchantFields fields = merchantFieldsAdminService.getOne(fieldsLambdaQueryWrapper);
+
+            MerchantFieldsVo fieldsVo = MerchantFieldsVo.getNew();
+            fieldsVo.copy(fields);
+            fieldAppliesVo.setFieldVo(fieldsVo);
+        }
+
+        mmap.put("fieldApplyInfo", fieldAppliesVo);
 
         return prefix + "/applyDetail";
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/merchant/MerchantSponsorAppliesController.java

@@ -10,6 +10,7 @@ import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.ShiroUtils;
 import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorAppliesAdminService;
 import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorApplyListParam;
+import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
 import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -61,7 +62,11 @@ public class MerchantSponsorAppliesController extends BaseController {
         LambdaQueryWrapper<MerchantSponsorApplies> sponsorAppliesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantSponsorApplies.class);
         sponsorAppliesLambdaQueryWrapper.eq(MerchantSponsorApplies::getSponsorApplyId, sponsorApplyId);
         MerchantSponsorApplies sponsorApplies = merchantSponsorAppliesAdminService.getOne(sponsorAppliesLambdaQueryWrapper);
-        mmap.put("sponsorApplyInfo", sponsorApplies);
+
+        MerchantSponsorAppliesVo sponsorAppliesVo = MerchantSponsorAppliesVo.getNew();
+        sponsorAppliesVo.copy(sponsorApplies);
+
+        mmap.put("sponsorApplyInfo", sponsorAppliesVo);
 
         return prefix + "/applyDetail";
     }