fix：企微收费弹窗

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/fee/HaobanQywxFeeDTO.java

@@ -45,6 +45,8 @@ public class HaobanQywxFeeDTO implements Serializable {
 
     private Integer autoActiveFlag;
 
+    private String enterpriseNames;
+
     public Long getQwFeeId() {
         return qwFeeId;
     }
@@ -132,5 +134,13 @@ public class HaobanQywxFeeDTO implements Serializable {
     public void setAutoActiveFlag(Integer autoActiveFlag) {
         this.autoActiveFlag = autoActiveFlag;
     }
+
+    public String getEnterpriseNames() {
+        return enterpriseNames;
+    }
+
+    public void setEnterpriseNames(String enterpriseNames) {
+        this.enterpriseNames = enterpriseNames;
+    }
 }
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/fee/HaobanQywxFeeApiService.java

@@ -57,4 +57,14 @@ public interface HaobanQywxFeeApiService {
      */
     void addInterceptLog(String param);
 
+    /**
+     * 最新一条将要被拦截记录
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link HaobanQywxFeeDTO }
+     * @author mozhu
+     * @date 2022-08-10 17:56:39
+     */
+    HaobanQywxFeeDTO queryByWxEnterpriseId(String wxEnterpriseId);
+
 }

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/QywxManageController.java

@@ -34,7 +34,6 @@ public class QywxManageController extends WebBaseController {
     private HaobanQywxFeeApiService haobanQywxFeeApiService;
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService;
-
     /**
      * 企微报错列表
      *
@@ -80,7 +79,7 @@ public class QywxManageController extends WebBaseController {
      * @return
      */
     @RequestMapping(value = "qywx-fee-detail", method = RequestMethod.GET)
-    public RestResponse qywxFeeList(String wxEnterpriseId) {
+    public RestResponse qywxFeeDetail(String wxEnterpriseId) {
         List<HaobanQywxFeeDetailDTO> haobanQywxFeeDetailDTOS = haobanQywxFeeApiService.feeDetail(wxEnterpriseId);
         return RestResponse.successResult(haobanQywxFeeDetailDTOS);
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeMapper.java

@@ -63,5 +63,15 @@ public interface TabHaobanQywxFeeMapper {
      * @return 影响行数
      */
     int deleteById(Long qwFeeId);
+
+    /**
+     * 最新一条将要被拦截记录
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link TabHaobanQywxFee }
+     * @author mozhu
+     * @date 2022-08-10 17:59:04
+     */
+    TabHaobanQywxFee queryByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/HaobanQywxFeeService.java

@@ -58,5 +58,13 @@ public interface HaobanQywxFeeService {
      */
     Page<HaobanQywxFeeBO> listPage(QywxFeeListQDTO qywxFeeListQDTO);
 
-
+    /**
+     * 最新一条将要被拦截记录
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link HaobanQywxFeeBO }
+     * @author mozhu
+     * @date 2022-08-10 17:57:35
+     */
+    HaobanQywxFeeBO queryByWxEnterpriseId(String wxEnterpriseId);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/impl/HaobanQywxFeeServiceImpl.java

@@ -77,4 +77,9 @@ public class HaobanQywxFeeServiceImpl implements HaobanQywxFeeService {
         List<TabHaobanQywxFee> tabHaobanQywxFees = tabHaobanQywxFeeMapper.listPage(qywxFeeListQDTO);
         return PageUtil.changePageHelperToCurrentPage(new PageInfo<>(tabHaobanQywxFees), HaobanQywxFeeBO.class);
     }
+
+    @Override
+    public HaobanQywxFeeBO queryByWxEnterpriseId(String wxEnterpriseId) {
+        return EntityUtil.changeEntityNew(HaobanQywxFeeBO.class,tabHaobanQywxFeeMapper.queryByWxEnterpriseId(wxEnterpriseId));
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/fee/HaobanQywxFeeApiServiceImpl.java

@@ -277,4 +277,9 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
         }
         haobanQywxFeeAccountInterceptLogService.insert(EntityUtil.changeEntityNew(TabHaobanQywxFeeAccountInterceptLog.class,haobanQywxFeeAccountInterceptLogDTO));
     }
+
+    @Override
+    public HaobanQywxFeeDTO queryByWxEnterpriseId(String wxEnterpriseId) {
+        return EntityUtil.changeEntityNew(HaobanQywxFeeDTO.class,haobanQywxFeeService.queryByWxEnterpriseId(wxEnterpriseId));
+    }
 }

haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeMapper.xml

@@ -112,5 +112,13 @@
         where qw_fee_id = #{qwFeeId}
     </delete>
 
+
+    <select id="queryByWxEnterpriseId" resultMap="TabHaobanQywxFeeMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_qywx_fee
+        where wx_enterprise_id = #{wxEnterpriseId} order by intercept_time desc limit 1
+    </select>
+
 </mapper>
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -20,9 +20,11 @@ import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDTO;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.MiniprogramSettingQo;
@@ -42,6 +44,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -77,6 +80,8 @@ public class WxEnterpriseController extends WebBaseController {
     private AuthorizeService authorizeService;
     @Autowired
     private HaobanUserApiService haobanUserApiService ;
+    @Autowired
+    private HaobanQywxFeeApiService haobanQywxFeeApiService;
 
     //授权企业列表
     @RequestMapping("wxa-enterprise-list")
@@ -780,4 +785,22 @@ public class WxEnterpriseController extends WebBaseController {
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
+    /**
+     * 最新一条将要被拦截记录
+     * @param wxEnterpriseId
+     * @return
+     */
+    @RequestMapping(value = "qywx-fee-wxEnterprise-detail", method = RequestMethod.GET)
+    public RestResponse qywxFeeWxEnterpriseListDetail(String wxEnterpriseId) {
+        HaobanQywxFeeDTO haobanQywxFeeDTO = haobanQywxFeeApiService.queryByWxEnterpriseId(wxEnterpriseId);
+        List<EnterpriseDetailDTO> enterpriseDetailDTOS = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
+        if (CollectionUtils.isNotEmpty(enterpriseDetailDTOS)) {
+            StringBuffer stringBuffer = new StringBuffer();
+            for (EnterpriseDetailDTO enterpriseDetailDTO : enterpriseDetailDTOS) {
+                stringBuffer.append(enterpriseDetailDTO.getEnterpriseName()).append(" ");
+            }
+            haobanQywxFeeDTO.setEnterpriseNames(stringBuffer.toString());
+        }
+        return RestResponse.successResult(haobanQywxFeeDTO);
+    }
 }

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -121,4 +121,5 @@
 					 timeout="10000" retries="0" check="false"/>
 
 	<dubbo:reference id="logSearchApiService" interface="com.gic.log.record.service.LogSearchApiService" timeout="10000" retries="0" check="false" />
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService" id="haobanQywxFeeApiService"/>
 </beans>