Merge branch 'order_received_statistics' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

@@ -12,6 +12,7 @@ import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.im.utils.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
@@ -192,4 +193,13 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         List<UserStaffBo> staffBos = mapper.findAllStaffsByCompanyIdAndPostionId(staffStatisticsFindDTO);
         return CollectionUtils.isEmpty(staffBos)?Collections.EMPTY_LIST:staffBos;
     }
+
+    public AppUserVo findByCode(String code) {
+        AppUserVo appUserVo = new AppUserVo();
+        AppUserDetail appUserDetail = new AppUserDetail();
+        appUserDetail.setCode(code);
+        appUserDetail = mapper.selectOne(appUserDetail);
+        org.springframework.beans.BeanUtils.copyProperties(appUserDetail,appUserVo);
+        return appUserVo;
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -372,4 +372,10 @@ public class AppUserController extends CommonBaseController{
     public List<UserStaffBo> findAllStaffs(){
        return userDetailBiz.findAllStaffs();
     }
+
+    @GetMapping("/app/unauth/code/{code}")
+    public ObjectRestResponse<AppUserVo> findAppuserInfoByCode(@PathVariable("code") String code){
+       AppUserVo appUserVo =  userDetailBiz.findByCode(code);
+       return ObjectRestResponse.succ(appUserVo);
+    }
 }

xx-order/xx-order-server/src/test/java/ServiceTest.java

@@ -128,14 +128,14 @@ public class ServiceTest {
     public void testOrderReceivedStatisticsJobHandler(){
         cn.hutool.core.date.DateTime dateTime = DateUtil.parse("2019-11-29", "yyyy-MM-dd");
      //   cn.hutool.core.date.DateTime offset = DateUtil.offset(dateTime, DateField.DAY_OF_MONTH, 1);
-        orderReceivedStatisticsJobHandler.execute("2019-11-29");
-       /* LocalDate startLocalDate = LocalDate.of(2019, 10, 1);
-        LocalDate endLocalDate = LocalDate.of(2019,11,29);
+     /*   orderReceivedStatisticsJobHandler.execute("2019-11-29");*/
+        LocalDate startLocalDate = LocalDate.of(2019, 10, 1);
+        LocalDate endLocalDate = LocalDate.of(2019,11,30);
         while (startLocalDate.isBefore(endLocalDate)){
             String dateStr = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             startLocalDate = startLocalDate.plusDays(1);
             orderReceivedStatisticsJobHandler.execute(dateStr);
-        }*/
+        }
 
     }
 }