MERGE

zhongzheng-admin-saas/src/main/resources/application-prod.yml

@@ -170,6 +170,7 @@ oldOrder:
 
 oldSys:
     host: https://www.xyyxt.net
+    goods: http://www.xyyxt.net/WitSystem/BussinessApi/NewYxtLogin
 
 invoice:
     host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log
@@ -186,3 +187,12 @@ exam:
     subscribeSaveExam: http://39.108.7.155:9099/cd/subscribe/save/exam
     subscribeUpdateExam: http://39.108.7.155:9099/cd/subscribe/update/exam
     subscribeAddExamNum: http://39.108.7.155:9099/cd/subscribe/add/num
+
+shared:
+    statistics: http://www.xyyxt.net/WitSystem/BussinessApi/HighSeasData
+    customer: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerStatsData
+    cert: http://www.xyyxt.net/WitSystem/BussinessApi/CertStatsData
+    orderArea: http://www.xyyxt.net/WitSystem/BussinessApi/OrderAreaData
+    rateData: http://www.xyyxt.net//WitSystem/BussinessApi/CustomerConversionRateData
+    rateTrend: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerConversionRateTrendData
+    customerOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerOrderData

zhongzheng-admin/src/main/resources/application-prod.yml

@@ -170,6 +170,7 @@ oldOrder:
 
 oldSys:
     host: http://test.jqbao.net
+    goods: http://www.xyyxt.net/WitSystem/BussinessApi/NewYxtLogin
 
 invoice:
     host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log
@@ -186,3 +187,12 @@ exam:
     subscribeSaveExam: http://39.108.7.155:9099/cd/subscribe/save/exam
     subscribeUpdateExam: http://39.108.7.155:9099/cd/subscribe/update/exam
     subscribeAddExamNum: http://39.108.7.155:9099/cd/subscribe/add/num
+
+shared:
+    statistics: http://www.xyyxt.net/WitSystem/BussinessApi/HighSeasData
+    customer: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerStatsData
+    cert: http://www.xyyxt.net/WitSystem/BussinessApi/CertStatsData
+    orderArea: http://www.xyyxt.net/WitSystem/BussinessApi/OrderAreaData
+    rateData: http://www.xyyxt.net//WitSystem/BussinessApi/CustomerConversionRateData
+    rateTrend: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerConversionRateTrendData
+    customerOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerOrderData

zhongzheng-api/src/main/resources/application-prod.yml

@@ -182,6 +182,7 @@ oldOrder:
 
 oldSys:
     host: http://test.jqbao.net
+    goods: http://www.xyyxt.net/WitSystem/BussinessApi/NewYxtLogin
 
 invoice:
     host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log
@@ -199,3 +200,12 @@ exam:
     subscribeSaveExam: http://39.108.7.155:9099/cd/subscribe/save/exam
     subscribeUpdateExam: http://39.108.7.155:9099/cd/subscribe/update/exam
     subscribeAddExamNum: http://39.108.7.155:9099/cd/subscribe/add/num
+
+shared:
+    statistics: http://www.xyyxt.net/WitSystem/BussinessApi/HighSeasData
+    customer: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerStatsData
+    cert: http://www.xyyxt.net/WitSystem/BussinessApi/CertStatsData
+    orderArea: http://www.xyyxt.net/WitSystem/BussinessApi/OrderAreaData
+    rateData: http://www.xyyxt.net//WitSystem/BussinessApi/CustomerConversionRateData
+    rateTrend: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerConversionRateTrendData
+    customerOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerOrderData

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -25,6 +25,7 @@ import com.zhongzheng.common.exception.BaseException;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.*;
+import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
 import com.zhongzheng.modules.alisms.service.IAliSmsService;
 import com.zhongzheng.modules.collect.domain.CollectBank;
@@ -41,6 +42,7 @@ import com.zhongzheng.modules.course.service.ICourseService;
 import com.zhongzheng.modules.course.service.ICourseSubjectService;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.goods.vo.UserNewGoodsVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.impl.ClassGradeServiceImpl;
@@ -144,6 +146,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     private ICourseSectionService iCourseSectionService;
     @Value("${liveGotoURL}")
     private String liveGotoURL;
+    @Value("${oldSys.goods}")
+    private String OLD_GOODS;
 
 
     @Override
@@ -1645,11 +1649,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         User user = getOne(queryWrapper);
         if(Validator.isEmpty(user)){
             iUserLoginErrorService.saveErrorLog(bo.getAccount());
-            throw new CustomException("登录信息错误");
+            //判断旧系统是否有账号
+            oldAccountLogin(bo,1);
         }
         else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
-            throw new BaseException("对不起，您的账号：已停用");
+            //判断旧系统是否有账号
+            oldAccountLogin(bo,1);
         }
         String password = null;
         if(bo.getPwd().length()>20){
@@ -1668,7 +1674,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (!SecurityUtils.matchesPassword(password,user.getPassword()))
         {
             iUserLoginErrorService.saveErrorLog(bo.getAccount());
-            throw new BaseException("登录信息错误");
+            //判断旧系统是否有账号
+            oldAccountLogin(bo,1);
         }
         //如果活动分销码变动
         if (StringUtils.isNotBlank(bo.getShareActivityCode())){
@@ -1684,6 +1691,58 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return map;
     }
 
+    private void oldAccountLogin(UserAppAccountLoginBo bo,Integer type) {
+        String msg = type == 1?"登录信息错误":"对不起，您的账号：已停用";
+        Boolean codeFlag = true;
+        Map<String, String> params = new HashMap<>();
+        Long nowTime = DateUtils.getNowTime();
+        String sign = ToolsUtils.EncoderByMd5(bo.getAccount()+bo.getAccount()+nowTime + "pubilc2022");
+        params.put("stamp", nowTime.toString());
+        params.put("sign", sign);
+        params.put("idNum", bo.getAccount());
+        params.put("passwordSign", "1");
+        params.put("telphone",bo.getAccount());
+        String password = null;
+        if(bo.getPwd().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.getPwd(),rsaPrivate);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }else{
+            password = bo.getPwd();
+        }
+        params.put("password", password);
+        String respone = "";
+        try {
+            respone = HttpUtils.postFormBody(OLD_GOODS, params);
+            if (!respone.contains("\"code\":200")) {
+                codeFlag = false;
+                throw new CustomException("登录信息错误");
+            }
+            JSONObject jsonObject = JSONObject.parseObject(respone);
+            Object data = jsonObject.get("data");
+            if (ObjectUtils.isNotNull(data)){
+                UserNewGoodsVo vo = JSONObject.parseObject(JSONObject.toJSONString(data), UserNewGoodsVo.class);
+                throw new CustomException(vo.getPcUrl());
+            }else {
+                codeFlag = false;
+                throw new CustomException(msg);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            if (codeFlag){
+                throw new CustomException(e.getMessage(),699);
+            }else {
+                throw new CustomException(e.getMessage());
+            }
+        }
+    }
+
     @Override
     public Boolean bindIdCard(UserAppBindIdBo bo) {
         if(Validator.isEmpty(bo.getIdCard())){

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

@@ -2948,7 +2948,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (ObjectUtils.isNotNull(bo.getEndTime())){
             params.put("endtime", DateUtils.timestampToDateFormat(bo.getEndTime(),"yyyy/MM/dd"));
         }
-        params.put("saleid", "0");
+        if (ObjectUtils.isNotNull(bo.getCustomerId())){
+            params.put("saleid", bo.getCustomerId().toString());
+        }else {
+            params.put("saleid", "0");
+        }
         String respone = "";
         try {
             respone = HttpUtils.postFormBody(SHARED_STATISTICS, params);
@@ -3141,13 +3145,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 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")));
+                        item.setTbDealRate(item.getTbDealRate().multiply(new BigDecimal("100")));
+                        item.setHbDealRate(item.getHbDealRate().multiply(new BigDecimal("100")));
+                        item.setZbDealRateStr(item.getZbDealRate().multiply(new BigDecimal("100")) + "%");
+                        item.setTbPriceRate(item.getTbPriceRate().multiply(new BigDecimal("100")));
+                        item.setHbPriceRate(item.getHbPriceRate().multiply(new BigDecimal("100")));
+                        item.setZbPriceRateStr(item.getZbPriceRate().multiply(new BigDecimal("100")) + "%");
+                        item.setConverDealRate(item.getConverDealRate().multiply(new BigDecimal("100")));
                     });
                 }
                 tableDataInfo.setRows(rateVo.get_Data());
@@ -3756,7 +3760,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         String sign = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
         params.put("stamp", nowTime.toString());
         params.put("sign", sign);
-//        params.put("type", bo.getType().toString());
+        params.put("type", bo.getType().toString());
+        params.put("sort", "1");
         params.put("page", bo.getPageNum().toString());
         params.put("pagesize", bo.getPageSize().toString());
         if (ObjectUtils.isNotNull(bo.getStartTime())){
@@ -3790,13 +3795,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 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")));
+                        item.setTbDealRate(item.getTbDealRate().multiply(new BigDecimal("100")));
+                        item.setHbDealRate(item.getHbDealRate().multiply(new BigDecimal("100")));
+                        item.setZbDealRateStr(item.getZbDealRate().multiply(new BigDecimal("100")) + "%");
+                        item.setTbPriceRate(item.getTbPriceRate().multiply(new BigDecimal("100")));
+                        item.setHbPriceRate(item.getHbPriceRate().multiply(new BigDecimal("100")));
+                        item.setZbPriceRateStr(item.getZbPriceRate().multiply(new BigDecimal("100")) + "%");
+                        item.setConverDealRate(item.getConverDealRate().multiply(new BigDecimal("100")));
                     });
                 }
                 tableDataInfo.setRows(rateVo.get_Data());

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderStatisticsBo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author yangdamao