代理人统计 店铺统计

ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java

@@ -6,13 +6,16 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.business.domain.BusIntegralRecord;
+import com.ruoyi.business.domain.BusStoreInfo;
 import com.ruoyi.business.service.IBusIntegralRecordService;
 import com.ruoyi.business.service.IBusStoreInfoService;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.SysLogininfor;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysLogininforService;
 import com.ruoyi.system.service.ISysUserService;
 import io.swagger.models.auth.In;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -51,6 +54,8 @@ public class BusAgentInfoController extends BaseController
     private IBusStoreInfoService iBusStoreInfoService;
     @Autowired
     private ISysUserService iSysUserService;
+    @Autowired
+    private ISysLogininforService iSysLogininforService;
     /**
      * 查询代理管理列表
      */
@@ -59,14 +64,26 @@ public class BusAgentInfoController extends BaseController
     public TableDataInfo list(BusAgentInfo busAgentInfo)
     {
         startPage();
-        LoginUser user = SecurityUtils.getLoginUser();
+//        LoginUser user = SecurityUtils.getLoginUser();
-        busAgentInfo.setSuperiorAgentCode(user.getUserId());
+//        busAgentInfo.setSuperiorAgentCode(user.getUserId());
         List<BusAgentInfo> list = busAgentInfoService.selectBusAgentInfoList(busAgentInfo);
         List<BusAgentInfo> listData = list.stream().map(bean -> {
-            bean.setGrantStoreNum(iBusStoreInfoService.getStoreNum(bean.getAgentAccount()));
+            BusStoreInfo busStoreInfo = new BusStoreInfo();
+            busStoreInfo.setBindUser(bean.getAgentAccount());
+            List<BusStoreInfo> ll = iBusStoreInfoService.selectBusStoreInfoList(busStoreInfo);
+            bean.setGrantStoreNum(ll.size());
+            List<BusStoreInfo> lll = ll.stream().filter(f -> "1".equals(f.getReturnVisitStatus())).collect(Collectors.toList());
+            bean.setOperateStoreNum(lll.size());
             SysUser user1 = iSysUserService.selectUserById(bean.getId());
-            bean.setLastLoginIp(user1.getLoginIp());
+            if(user1 != null){
-            bean.setLastLoginTime(user1.getLoginDate());
+                bean.setLastLoginIp(user1.getLoginIp());
+                bean.setLastLoginTime(user1.getLoginDate());
+            }
+            SysLogininfor sysLogininfor = new SysLogininfor();
+            sysLogininfor.setUserName(bean.getAgentAccount());
+            sysLogininfor.setMsg("登录成功");
+            List<SysLogininfor> llll = iSysLogininforService.selectLogininforList(sysLogininfor);
+            bean.setLoginNum(llll.size());
             return bean;
         }).collect(Collectors.toList());
         return getDataTable(listData);

ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentIntegralController.java

@@ -102,14 +102,14 @@ public class BusAgentIntegralController extends BaseController
         BusIntegralRecord record = new BusIntegralRecord();
         record.setAccount(busAgentInfo.getAgentAccount());
         record.setUpdateType("增加账分");
-        record.setIntegralUpdateNum(Long.valueOf(busAgentInfo.getIntegral1()));
+        record.setIntegralUpdateNum(Integer.valueOf(busAgentInfo.getIntegral1()));
         record.setCreateTime(new Date());
 
         BusAgentInfo temp = busAgentInfoService.selectBusAgentInfoById(busAgentInfo.getId());
         int oldValue = Integer.valueOf(temp.getIntegral());
         int newValue = Integer.valueOf(busAgentInfo.getIntegral1());
         busAgentInfo.setIntegral(String.valueOf(oldValue+newValue));
-        record.setIntegralBalance(Long.valueOf(oldValue+newValue));
+        record.setIntegralBalance(Integer.valueOf(oldValue+newValue));
 
         recordService.insertBusIntegralRecord(record);
         return toAjax(busAgentInfoService.updateBusAgentInfo(busAgentInfo));

ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java

@@ -60,8 +60,8 @@ public class BusIntegralConsumeController extends BaseController
         List<BusAgentInfo> list = agentInfoService.selectBusAgentInfoList(agentInfo);
         if (list.size() > 0){
             BusAgentInfo info = list.get(0);
-            String integral = String.valueOf(Integer.valueOf(info.getIntegral()) - busIntegralRecord.getIntegralUpdateNum().intValue());
+            String integral = String.valueOf(Integer.valueOf(info.getIntegral()) - busIntegralRecord.getIntegralUpdateNum());
-            long integral1 = Long.valueOf(Integer.valueOf(info.getIntegral()) - busIntegralRecord.getIntegralUpdateNum().intValue());
+            Integer integral1 = Integer.valueOf(Integer.valueOf(info.getIntegral()) - busIntegralRecord.getIntegralUpdateNum());
             busIntegralRecord.setIntegralBalance(integral1);
             info.setIntegral(integral);
             agentInfoService.updateBusAgentInfo(info);

ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java

@@ -4,11 +4,13 @@ import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.business.domain.BusReturnVisitInfo;
 import com.ruoyi.business.domain.BusStoreConfigInfo;
 import com.ruoyi.business.domain.BusStoreDayInfo;
 import com.ruoyi.business.req.ReqBusStoreConfigInfo;
 import com.ruoyi.business.req.ReqBusStoreInfo;
 import com.ruoyi.business.resp.RespBusStoreInfo;
+import com.ruoyi.business.service.IBusReturnVisitInfoService;
 import com.ruoyi.business.service.IBusStoreConfigInfoService;
 import com.ruoyi.business.service.IBusStoreDayInfoService;
 import com.ruoyi.common.exception.ServiceException;
@@ -54,6 +56,9 @@ public class BusStoreInfoController extends BaseController
 
     @Autowired
     private IBusStoreDayInfoService busStoreDayInfoService;
+
+    @Autowired
+    private IBusReturnVisitInfoService iBusReturnVisitInfoService;
     /**
      * 查询店铺信息列表
      */
@@ -83,13 +88,25 @@ public class BusStoreInfoController extends BaseController
                 BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
                 busStoreDayInfo.setStoreId(info.getId());
                 List<BusStoreDayInfo> ll = busStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo);
+                int a = ll.get(0).getLastReturnVisitNum();
+                int b = ll.get(0).getLastOrderNum();
                 info.setLastOrderNum(ll.get(0).getLastOrderNum());
                 info.setLastPositiveReviewsNum(ll.get(0).getLastPositiveReviewsNum());
                 info.setLastFiveStarReviewsNum(ll.get(0).getLastFiveStarReviewsNum());
                 info.setLastReturnVisitNum(ll.get(0).getLastReturnVisitNum());
                 info.setTodayReturnVisitNum(ll.get(0).getTodayReturnVisitNum());
                 info.setScore(ll.get(0).getScore());
-                info.setLastReturnVisitRate(ll.get(0).getLastReturnVisitRate());
+                if(b!=0&&a!=0){
+                    java.text.DecimalFormat df = new java.text.DecimalFormat("#.00");
+                    String formattedResult = df.format((double)a/b);
+                    info.setLastReturnVisitRate(formattedResult);
+                }else{
+                    info.setLastReturnVisitRate("0");
+                }
+                BusReturnVisitInfo busReturnVisitInfo = new BusReturnVisitInfo();
+                busReturnVisitInfo.setStoreCode(busStoreInfo1.getStoreCode());
+                List<BusReturnVisitInfo> lll = iBusReturnVisitInfoService.selectBusReturnVisitInfoList(busReturnVisitInfo);
+                info.setTodayReturnVisitNum(lll.size());
                 return info;
             })
             .collect(Collectors.toList());

ruoyi-system/src/main/java/com/ruoyi/business/domain/BusStoreInfo.java

@@ -73,9 +73,8 @@ public class BusStoreInfo extends BaseEntity
     private Long updateId;
 
     /** 更新操作账户 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新操作账户")
-    @Excel(name = "更新操作账户", width = 30, dateFormat = "yyyy-MM-dd")
+    private String updateUser;
-    private Date updateUser;
 
     /** 是否自配送 */
     @Excel(name = "是否自配送")
@@ -224,12 +223,12 @@ public class BusStoreInfo extends BaseEntity
     {
         return updateId;
     }
-    public void setUpdateUser(Date updateUser) 
+    public void setUpdateUser(String updateUser)
     {
         this.updateUser = updateUser;
     }
 
-    public Date getUpdateUser() 
+    public String getUpdateUser()
     {
         return updateUser;
     }

ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java

@@ -77,5 +77,4 @@ public interface IBusStoreInfoService
      */
     int saveOrUpdateConfig(BusStoreConfigInfo busStoreConfigInfo);
 
-    int getStoreNum(String agentAccount);
 }

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java

@@ -134,6 +134,7 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
         Long[] roles = {101L};
         user.setRoleIds(roles);
         userService.insertUser(user);
+        busAgentInfo.setId(user.getUserId());
         return insertBusAgentInfo(busAgentInfo);
     }
 

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java

@@ -14,6 +14,7 @@ import com.ruoyi.business.service.IBusStoreInfoService;
 import com.ruoyi.business.service.IMeituanService;
 import com.ruoyi.common.config.ProxyProperties;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import org.apache.http.HttpEntity;
@@ -83,10 +84,12 @@ public class MeituanServiceImpl implements IMeituanService {
      */
     @Override
     public R cookieInfo(SysCookie cookie) {
+        LoginUser loginUser = new LoginUser();
         BusStoreInfo storeInfo = new BusStoreInfo();
         storeInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie()));
         List<BusStoreInfo> list = busStoreInfoService.selectBusStoreInfoList(storeInfo);
         if (list.size() == 0) {
+            storeInfo.setBindId(loginUser.getUserId());
             storeInfo.setBindUser(cookie.getUserName());
             storeInfo.setStoreAccount(cookie.getAccount());
             storeInfo.setStorePassword(cookie.getPassword());
@@ -94,6 +97,7 @@ public class MeituanServiceImpl implements IMeituanService {
             storeInfo.setStoreCookie(cookie.getCookie());
             storeInfo.setPlatformType(String.valueOf(cookie.getBingType()));
             storeInfo.setBindTime(new Date());
+            storeInfo.setUpdateTime(new Date());
             storeInfo.setGrantStatus("1");//授权登录状态
             storeInfo.setReturnVisitStatus("2");// 营销状态
             storeInfo.setSelfDeliveryStatus("1");// 1 正常， 2 自配送， 3 删除
@@ -108,6 +112,9 @@ public class MeituanServiceImpl implements IMeituanService {
                 throw new ServiceException("授权失败，已绑定其他代理账号！");
             }
             storeInfo.setId(list.get(0).getId());
+            storeInfo.setUpdateTime(new Date());
+            storeInfo.setUpdateId(loginUser.getUserId());
+            storeInfo.setUpdateUser(loginUser.getUsername());
             storeInfo.setStoreAccount(cookie.getAccount());
             storeInfo.setStorePassword(cookie.getPassword());
             storeInfo.setStoreName(cookie.getWmPoiName());