小程序查看箱码合一详情总数量修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/ReportServiceImpl.java

@@ -123,11 +123,13 @@ public class ReportServiceImpl implements ReportService {
      */
     @Override
     public QueryWxFactoryRes queryWxFactory(QueryWxFactoryReq queryWxFactoryReq) {
-        Long id = TokenUtil.getUser().getId();
+        UserUtil.UserBean wholeUser = userUtil.getWholeUser();
+        Long userId = wholeUser.getId();
         // 是小程序用户主账号 1-是 0-不是
-        Integer isMainAccount = userUtil.getWholeUser().getIsMainAccount();
+        Integer isMainAccount = wholeUser.getIsMainAccount();
+
         QueryWxFactoryRes res = new QueryWxFactoryRes();
-        if (isMainAccount.equals(0)) {
+        if (isMainAccount!=null && isMainAccount == 0) {
             //子账号报表
             //返回数据初始化（4个月份）
             List<QueryWxFactoryVO> queryWxFactorySumSummary = new ArrayList<QueryWxFactoryVO>();
@@ -137,7 +139,7 @@ public class ReportServiceImpl implements ReportService {
             List<QueryWxFactoryVO> queryWxFactorySumNumber = reportServiceMapper.queryWxFactorySumNumber(queryWxFactoryReq,getMonth());
             Map<String, Long> sumNumberMap = queryWxFactorySumNumber.stream().collect(Collectors.toMap(QueryWxFactoryVO::getMonth, QueryWxFactoryVO::getTotal));
             //激活量
-            List<QueryWxFactoryVO> queryWxFactoryActivationNumber = reportServiceMapper.queryWxFactoryActivationNumber(queryWxFactoryReq,getMonth(),id);
+            List<QueryWxFactoryVO> queryWxFactoryActivationNumber = reportServiceMapper.queryWxFactoryActivationNumber(queryWxFactoryReq,getMonth(),userId);
             Map<String, Long> activationNumberMap = queryWxFactoryActivationNumber.stream().collect(Collectors.toMap(QueryWxFactoryVO::getMonth, QueryWxFactoryVO::getActivation));
             //信息汇总
             queryWxFactorySumSummary.forEach(factorySumNumber->{
@@ -158,6 +160,7 @@ public class ReportServiceImpl implements ReportService {
             res.setQueryWxFactoryBeanList(queryWxFactoryBeans);
             return res;
         }
+
         //下单量-激活量-库存
         //总量=下单量
         List<QueryWxFactoryVO> queryWxFactorySumNumber = reportServiceMapper.queryWxFactorySumNumber(queryWxFactoryReq,null);
@@ -169,10 +172,12 @@ public class ReportServiceImpl implements ReportService {
             Long aLong = (null == activationNumberMap.get(factorySumNumber.getMonth()) ? 0L : activationNumberMap.get(factorySumNumber.getMonth()));
             factorySumNumber.setActivation(aLong);
         });
+
         List<QueryWxFactoryRes.QueryWxFactoryBean> queryWxFactoryBeans = PojoConverterUtils.copyList(queryWxFactorySumNumber, QueryWxFactoryRes.QueryWxFactoryBean.class);
         Long total = queryWxFactoryBeans.stream().mapToLong(QueryWxFactoryRes.QueryWxFactoryBean::getTotal).sum();
         Long activation = queryWxFactoryBeans.stream().mapToLong(QueryWxFactoryRes.QueryWxFactoryBean::getActivation).sum();
         Long stock= total-activation;
+
         QueryWxFactoryRes.QueryWxFactoryBean factoryBean= new QueryWxFactoryRes.QueryWxFactoryBean();
         factoryBean.setActivation(activation);
         factoryBean.setInStock(stock);
@@ -180,6 +185,7 @@ public class ReportServiceImpl implements ReportService {
         List<QueryWxFactoryRes.QueryWxFactoryBean> list = new ArrayList<>();
         list.add(factoryBean);
         res.setQueryWxFactoryBeanList(list);
+
         return res;
 
     }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxMappingMapper.xml

@@ -152,7 +152,8 @@
 
     <select id="getActivateDetail" resultType="com.abi.qms.platform.dao.vo.result.ActivateDetailVo">
         select qbm.box_code,ba.active_name,bm.material_name,qbm.active_status,
-            case when qp.qr_type = 2 then qp.qr_number else 0 end as capNum
+            case when qp.qr_type = 2 then qbm.qr_code_count else 0 end as cap_num
+
         from qr_box_mapping qbm
             left join qr_package qp on qbm.package_id=qp.id
             left join base_material bm on bm.id = qp.material_id

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/ReportServiceMapper.xml

@@ -119,6 +119,7 @@
         </where>
         GROUP BY `month`
         ORDER BY `month`
+
     </select>