MERGE

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopSharedCustomerController.java

@@ -64,8 +64,8 @@ public class TopSharedCustomerController extends BaseController {
      */
     @ApiOperation("城市转化排行")
     @GetMapping("/order/area")
-    public AjaxResult<TopOrderAreaVo> getOrderAreaData(TopOrderStatisticsBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getOrderAreaData(bo));
+    public TableDataInfo<TopOrderAreaDataVo> getOrderAreaData(TopOrderStatisticsBo bo) {
+        return iTopOldOrderService.getOrderAreaData(bo);
     }
 
     /**
@@ -73,14 +73,14 @@ public class TopSharedCustomerController extends BaseController {
      */
     @ApiOperation("客户转化排名")
     @GetMapping("/conversion/rate")
-    public AjaxResult<TopConversionRateVo> getConversionRateData(TopOrderStatisticsBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getConversionRateData(bo));
+    public TableDataInfo<TopConversionRateDataVo> getConversionRateData(TopOrderStatisticsBo bo) {
+        return iTopOldOrderService.getConversionRateData(bo);
     }
 
     /**
-     * 公海客户列表
+     * 公海客户走势图
      */
-    @ApiOperation("公海客户列表")
+    @ApiOperation("公海客户走势图")
     @GetMapping("/customer/list")
     public AjaxResult<List<TopConversionRateTrendVo>> getCustomerListData(TopOrderStatisticsBo bo) {
         return AjaxResult.success(iTopOldOrderService.getCustomerListData(bo));

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -5103,14 +5103,30 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
         //是否校验密码
         if (ObjectUtils.isNotNull(bo.getPasswordSign()) && bo.getPasswordSign() == 1){
-            if (!bo.getPassword().equals(EncryptHandler.decrypt(user.getPassword()))){
-                throw new CustomException("用户账号密码有误！");
+            String password = null;
+            if(bo.getPassword().length()>20){
+                String rsaPrivate = null;
+                try {
+                    InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("config/pri.key");
+                    rsaPrivate = AES.getStringByInputStream_1(certStream);
+                    certStream.close();
+                    password = AES.decrypt(bo.getPassword(),rsaPrivate);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }else{
+                password = bo.getPassword();
+            }
+            if (!SecurityUtils.matchesPassword(password,user.getPassword()))
+            {
+                throw new BaseException("登录信息密码错误");
             }
+
         }
 
         List<UserOrderGoodsListVo> goodsList = baseMapper.getUserOrderGoodsList(user.getUserId());
-        if (CollectionUtils.isEmpty(goodsList)) {
-            return null;
+        if (CollectionUtils.isNotEmpty(goodsList)) {
+            vo.setGoodsNames(goodsList.stream().limit(3).map(UserOrderGoodsListVo::getCategoryName).collect(Collectors.toList()));
         }
 
         //缓存用户信息key
@@ -5122,7 +5138,6 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         String pcUrl = String.format("%s%s/person-center/my-course?skipPort=%s", URL_PREFIX, sysTenant.getHostPc(), key);
         vo.setH5Url(h5Url);
         vo.setPcUrl(pcUrl);
-        vo.setGoodsNames(goodsList.stream().limit(3).map(UserOrderGoodsListVo::getCategoryName).collect(Collectors.toList()));
         UserPhoneBo phoneBo = new UserPhoneBo();
         phoneBo.setTelphone(bo.getTelphone());
         phoneBo.setTenantId(tenantId);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOldOrderService.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.goods.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.modules.top.financial.bo.*;
 import com.zhongzheng.modules.top.financial.vo.*;
 import com.zhongzheng.modules.top.goods.bo.*;
@@ -166,9 +167,9 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 
 	TopCertStatsVo getCertStatsData(TopOrderStatisticsBo bo);
 
-	TopOrderAreaVo getOrderAreaData(TopOrderStatisticsBo bo);
+	TableDataInfo<TopOrderAreaDataVo> getOrderAreaData(TopOrderStatisticsBo bo);
 
-	TopConversionRateVo getConversionRateData(TopOrderStatisticsBo bo);
+	TableDataInfo<TopConversionRateDataVo> getConversionRateData(TopOrderStatisticsBo bo);
 
 	List<TopOrderCustomerVo> getCustomerList();
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -17,6 +17,7 @@ import com.github.pagehelper.Page;
 import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
@@ -2954,7 +2955,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             JSONObject jsonObject = JSONObject.parseObject(respone);
             Object data = jsonObject.get("Data");
             if (ObjectUtils.isNotNull(data)){
+                BigDecimal cardinal = new BigDecimal("100.00");
                 totalVo = JSONObject.parseObject(JSONObject.toJSONString(data), TopSharedCustomerTotalVo.class);
+                totalVo.setHbDealRate(totalVo.getHbDealRate().multiply(cardinal));
+                totalVo.setTbDealRate(totalVo.getTbDealRate().multiply(cardinal));
+                totalVo.setTbPriceRate(totalVo.getOrderTotalPrice().multiply(cardinal));
+                totalVo.setConverDealRate(totalVo.getConverDealRate().multiply(cardinal));
+                totalVo.setHbPriceRate(totalVo.getHbPriceRate().multiply(cardinal));
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -3026,7 +3033,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     }
 
     @Override
-    public TopOrderAreaVo getOrderAreaData(TopOrderStatisticsBo bo) {
+    public TableDataInfo<TopOrderAreaDataVo> getOrderAreaData(TopOrderStatisticsBo bo) {
+        TableDataInfo<TopOrderAreaDataVo> tableDataInfo = new TableDataInfo();
         //筛选时间处理
         if (ObjectUtils.isNull(bo.getTimeSign()) && ObjectUtils.isNull(bo.getStartTime()) && ObjectUtils.isNull(bo.getEndTime())){
             //没有选择时间范围，默认为当前时间向前推30天
@@ -3069,16 +3077,19 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             Object data = jsonObject.get("Data");
             if (ObjectUtils.isNotNull(data)){
                 areaVo = JSONObject.parseObject(JSONObject.toJSONString(data), TopOrderAreaVo.class);
+                tableDataInfo.setRows(areaVo.get_Data());
+                tableDataInfo.setTotal(areaVo.getTotalCount());
             }
         }catch (Exception e){
             e.printStackTrace();
             throw new CustomException("公海城市转化排行接口错误");
         }
-        return areaVo;
+        return tableDataInfo;
     }
 
     @Override
-    public TopConversionRateVo getConversionRateData(TopOrderStatisticsBo bo) {
+    public TableDataInfo<TopConversionRateDataVo> getConversionRateData(TopOrderStatisticsBo bo) {
+        TableDataInfo<TopConversionRateDataVo> tableDataInfo = new TableDataInfo();
         //筛选时间处理
         if (ObjectUtils.isNull(bo.getStartTime()) && ObjectUtils.isNull(bo.getEndTime())){
             //没有选择时间范围，默认为当前时间向前推30天
@@ -3125,12 +3136,25 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             Object data = jsonObject.get("Data");
             if (ObjectUtils.isNotNull(data)){
                 rateVo = JSONObject.parseObject(JSONObject.toJSONString(data), TopConversionRateVo.class);
+                if (CollectionUtils.isNotEmpty(rateVo.get_Data())){
+                    rateVo.get_Data().forEach(item -> {
+                        item.setTbDealRate(item.getTbDealRate().multiply(new BigDecimal("100.00")));
+                        item.setHbDealRate(item.getHbDealRate().multiply(new BigDecimal("100.00")));
+                        item.setZbDealRateStr(item.getZbDealRate().multiply(new BigDecimal("100.00")) + "%");
+                        item.setTbPriceRate(item.getTbPriceRate().multiply(new BigDecimal("100.00")));
+                        item.setHbPriceRate(item.getHbPriceRate().multiply(new BigDecimal("100.00")));
+                        item.setZbPriceRateStr(item.getZbPriceRate().multiply(new BigDecimal("100.00")) + "%");
+                        item.setConverDealRate(item.getConverDealRate().multiply(new BigDecimal("100.00")));
+                    });
+                }
+                tableDataInfo.setRows(rateVo.get_Data());
+                tableDataInfo.setTotal(rateVo.getTotalCount());
             }
         }catch (Exception e){
             e.printStackTrace();
             throw new CustomException("公海客户转化排行接口错误");
         }
-        return rateVo;
+        return tableDataInfo;
     }
 
     @Override
@@ -3485,6 +3509,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             Object data = jsonObject.get("Data");
             if (ObjectUtils.isNotNull(data)){
                 trendVos = JSONArray.parseArray(JSONObject.toJSONString(data),TopConversionRateTrendVo.class);
+                trendVos.forEach(item -> {
+                    Long aLong = DateUtils.dateTimeSec("yyyy/MM/dd", item.getDate());
+                    item.setDate(DateUtils.timestampToDateFormat(aLong,"yyyy-MM-dd"));
+                });
             }
         }catch (Exception e){
             e.printStackTrace();

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopConversionRateDataVo.java

@@ -34,6 +34,9 @@ public class TopConversionRateDataVo implements Serializable {
     @ApiModelProperty("占比转化量")
     private BigDecimal zbDealRate;
 
+    @ApiModelProperty("占比转化量字符")
+    private String zbDealRateStr;
+
     @ApiModelProperty("同比转化金额")
     private BigDecimal tbPriceRate;
 
@@ -43,6 +46,9 @@ public class TopConversionRateDataVo implements Serializable {
     @ApiModelProperty("占比转化金额 ")
     private BigDecimal zbPriceRate;
 
+    @ApiModelProperty("占比转化金额字符 ")
+    private String zbPriceRateStr;
+
     @ApiModelProperty("机构名称")
     private String orgName;