Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-03 50d262111395f9c0a3c986f87324ada90fcbc4f8

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java

@@ -250,7 +250,7 @@

                if(allNum>0 && score>0)
                {
                    java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.##");//传入格式模板
                    java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.#");//传入格式模板
                    String workEfficiency=weekDf.format((float)score/(float)allNum);
                    bean.setNum(workEfficiency);
                }

 flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java

@@ -74,7 +74,6 @@
                    huaChengSysUser=list.get(0);
                }


                if(huaChengSysUser!=null && !StringUtils.isEmpty(huaChengSysUser.getUserId()) )
                {
                    SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone(),null);
@@ -95,6 +94,14 @@
                        newSysUser.setOpenid(huaChengSysUser.getOpenid());
                        IUserService.insertConfig(newSysUser);
                    }
                    else
                    {
                        if(StringUtils.isEmpty(sysUser.getOpenid()))
                        {
                            sysUser.setOpenid(huaChengSysUser.getOpenid());
                            IUserService.updateConfig(sysUser);
                        }
                    }
                    //新增浏览记录
                    iSysUserRecordService.add(sysUser);
                    //删除因为token问题产出的重复脏数据