Merge branch 'feature-qywx-fee' into developer

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

@@ -15,6 +15,7 @@ import com.gic.haoban.manage.api.dto.qdto.QywxFeeListQDTO;
 import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.fee.*;
 import com.gic.haoban.manage.service.pojo.bo.fee.HaobanQywxFeeBO;
 import com.gic.haoban.manage.service.service.StaffService;
@@ -252,6 +253,15 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
     public void addInterceptLog(String param) {
         HaobanQywxFeeAccountInterceptLogDTO haobanQywxFeeAccountInterceptLogDTO = JSON.toJavaObject(JSON.parseObject(param),HaobanQywxFeeAccountInterceptLogDTO.class);
         haobanQywxFeeAccountInterceptLogDTO.setFeeAccountInterceptId(UniqueIdUtils.uniqueLong());
+        TabHaobanWxEnterprise haobanWxEnterprise = wxEnterpriseService.getEnterpriseBycorpId(haobanQywxFeeAccountInterceptLogDTO.getCorpId());
+        if (haobanWxEnterprise != null) {
+            String wxEnterpriseId = haobanWxEnterprise.getWxEnterpriseId();
+            haobanQywxFeeAccountInterceptLogDTO.setWxEnterpriseId(wxEnterpriseId);
+            TabHaobanStaff tabHaobanStaff = staffService.selectByUserIdAndEnterpriseId(haobanQywxFeeAccountInterceptLogDTO.getWxUserId(), wxEnterpriseId);
+            if (tabHaobanStaff != null) {
+                haobanQywxFeeAccountInterceptLogDTO.setStaffId(tabHaobanStaff.getStaffId());
+            }
+        }
         haobanQywxFeeAccountInterceptLogService.insert(EntityUtil.changeEntityNew(TabHaobanQywxFeeAccountInterceptLog.class,haobanQywxFeeAccountInterceptLogDTO));
     }
 }