Merge branch 'master' of http://gitlab.scsmile.cn/zxf/enterprise-platform

enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/StaffApiController.java

@@ -137,7 +137,7 @@ public class StaffApiController extends AbstractBaseController<StaffReq>{
         }
         try {
             if(!ObjectUtils.isEmpty(staffReq.getId())){
-                bussinesscardService.sendBusinessCard(staffReq.getId());
+                bussinesscardService.sendBusinessCard(staffReq.getId(),context);
             }else {
                 rest = Rest.fail("缺少id");
             }

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/BussinesscardService.java

 package com.mortals.xhx.module.bussinesscard.service;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.bussinesscard.model.BussinesscardEntity;
 import com.mortals.xhx.module.bussinesscard.dao.BussinesscardDao;
@@ -18,5 +19,5 @@ public interface BussinesscardService extends ICRUDService<BussinesscardEntity,L
      * 发送名片
      * @param id
      */
-    void sendBusinessCard(Long id);
+    void sendBusinessCard(Long id, Context context);
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/impl/BussinesscardServiceImpl.java

@@ -3,6 +3,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.module.company.model.CompanyEntity;
 import com.mortals.xhx.module.company.service.CompanyService;
 import com.mortals.xhx.module.favorites.model.FavoritesBusinesscardEntity;
@@ -45,6 +47,8 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
     private FavoritesBusinesscardService favoritesBusinesscardService;
     @Autowired
     private StaffService staffService;
+    @Autowired
+    private UserService userService;
 
     @Override
     protected void saveBefore(BussinesscardEntity entity, Context context) throws AppException {
@@ -116,7 +120,7 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
     }
 
     @Override
-    public void sendBusinessCard(Long id) {
+    public void sendBusinessCard(Long id,Context context) {
         BussinesscardEntity entity = this.get(id);
         if(entity!=null) {
             Map condition = new HashMap();
@@ -126,5 +130,19 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
             data.put("updateTime", new Date());
             this.dao.update(data,condition);
         }
+        if(context!=null && context.getUser()!=null){
+            UserEntity userEntity = userService.get(context.getUser().getId());
+            if(userEntity!=null&&userEntity.getStaffId()!=null){
+                StaffEntity staffEntity = staffService.get(userEntity.getStaffId());
+                if(staffEntity!=null){
+                    Map condition = new HashMap();
+                    condition.put("id", staffEntity.getId());
+                    Map data = new HashMap();
+                    data.put("sendBusinessCardTimesIncrement", 1);
+                    data.put("updateTime", new Date());
+                    staffService.getDao().update(data,condition);
+                }
+            }
+        }
     }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/vo/HomeStatInfo.java

 package com.mortals.xhx.module.company.model.vo;
 
-import com.mortals.xhx.module.bussinesscard.model.BussinesscardEntity;
 import com.mortals.xhx.module.company.model.CompanyEntity;
 import com.mortals.xhx.module.news.model.NewsCategoryEntity;
 import com.mortals.xhx.module.product.model.ProductEntity;
@@ -74,7 +73,7 @@ public class HomeStatInfo {
     /**
      * 发送卡片总量
      */
-    private List<BussinesscardEntity> sendCardStaffList;
+    private List<StaffEntity> sendCardStaffList;
 
 
 }

enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java

@@ -289,7 +289,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
 
         homeStatInfo.setAccessStatList(dayAccessList);
 
-        homeStatInfo.setSendCardStaffList(bussinesscardList);
+        homeStatInfo.setSendCardStaffList(staffList);
         return Rest.ok(homeStatInfo);
     }