商户交易统计接口优化

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/KxsMerchantTradeService.java

@@ -19,12 +19,5 @@ public interface KxsMerchantTradeService extends IService<KxsMerchantTrade> {
      * @return {@link R}
      */
     R merchantTradeDetail(Long mchId,String month);
-
-    /**
-     * 查询商户总交易额
-     * @param mchId MCH ID
-     * @return {@link R}
-     */
-    R loadByMchTotalTrade(Long mchId);
 }
 

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/impl/KxsMerchantTradeServiceImpl.java

@@ -90,12 +90,6 @@ public class KxsMerchantTradeServiceImpl extends ServiceImpl<KxsMerchantTradeMap
         return R.ok(mchTradeVo);
     }
 
-    @Override
-    public R loadByMchTotalTrade(Long mchId) {
-
-        return null;
-    }
-
 
 }
 

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/impl/KxsUserActTradeServiceImpl.java

@@ -211,7 +211,7 @@ public class KxsUserActTradeServiceImpl extends ServiceImpl<KxsUserActTradeMappe
                 //不存在则填充空数据
                 ArrayList<MchActTimeAddVO> activityAddVOS = new ArrayList<>();
                 MchActTimeAddVO activityAddVO = new MchActTimeAddVO();
-                activityAddVO.setName("all");
+                activityAddVO.setName("总激活");
                 activityAddVO.setTotal(0);
                 activityAddVOS.add(activityAddVO);
                 MchActTimeTotalVO timeVO = new MchActTimeTotalVO();

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/RemoteOldService.java

@@ -55,10 +55,88 @@ public interface RemoteOldService {
 	R feeSet(@RequestBody Object  param);
 
 	/**
-	 * 团队开机统计-开机统计查询
-	 * @param param 请求实体
+	 * 入网查询
+	 *
+	 * @param param 参数
+	 * @return {@link R}
+	 */
+	@GetExchange("/api/v1/Hyf/PreCheckIdCard")
+	R preCheckIdCard(@RequestParam Map<String, Object> param);
+
+	/**
+	 * 领导奖-详情
+	 *
+	 * @param param 参数
+	 * @return {@link R}
+	 */
+	@GetExchange("/api/v1/LeaderComp/PersonalInfo")
+	R personalInfo(@RequestParam Map<String, Object> param);
+
+	/**
+	 * 领导奖-列表
+	 *
+	 * @param param 参数
+	 * @return {@link R}
 	 */
-	@GetExchange("/v1/kxsmain/users/getteamopenposinfo")
-	R teamOpenTotalData(@RequestParam("value") String param);
+	@GetExchange("/api/v1/LeaderComp/List")
+	R leaderList(@RequestParam Map<String, Object> param);
+
+	/**
+	 * 领导奖-列表明细
+	 *
+	 * @param param 参数
+	 * @return {@link R}
+	 */
+	@GetExchange("/api/v1/LeaderComp/ListLast")
+	R listLast(@RequestParam Map<String, Object> param);
+
+
+	/**
+	 * 推荐奖
+	 *     达标创客列表
+	 *
+	 * @param param 参数
+	 * @return {@link R}
+	 */
+	@GetExchange("/api/v1/recommendtradesummary/listv2")
+	R recommendSummary(@RequestParam Map<String, Object> param);
+
+	/**
+	 * 888活动
+	 *     达标进度详情
+	 */
+	@GetExchange("/api/v1/ActivityProgressBar/List")
+	R activityProgressBar(@RequestParam Map<String, Object> param);
+
+	/**
+	 * 红包奖池：
+	 *     获取创客获奖信息
+	 *
+	 * @param param 参数
+	 * @return {@link R}
+	 */
+	@GetExchange("/api/v1/activityredpackagejoins/detail")
+	R activityredpackagejoins(@RequestParam Map<String, Object> param);
+
+	/**
+	 * 红包奖池
+	 * 获取排行榜
+	 *
+	 * @param param 参数
+	 * @return {@link R}
+	 */
+	@GetExchange("/api/v1/activityredpackagetop10/list")
+	R activityredpackagetop10(@RequestParam Map<String, Object> param);
+
+	/**
+	 * 红包奖池
+	 * 获取参与记录
+	 *
+	 * @param param 参数
+	 * @return {@link R}
+	 */
+	@GetExchange("/api/v1/activityredpackagejoins/list")
+	R activityredpackagejoinsList(@RequestParam Map<String, Object> param);
+
 
 }