Merge branch 'master' into pre

netflix-dao/src/main/java/com/cyksj/mapper/OrderDonMapper.java

@@ -71,5 +71,5 @@ public interface OrderDonMapper extends BaseMapper<OrderDon> {
 
 	Page<CorpTagUserOrderDataView> getTagUserTimeOrderData(@Param("page") Page<Object> objectPage, @Param("tagIdStr") String tagIdStr, @Param("toDate") String toDate, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-	List<RealGoodsSourceData> getRealGoodsSourceData(@Param("startDate") String startDate, @Param("endDate") String endDate);
+	List<RealGoodsSourceData> getRealGoodsSourceData(@Param("isGeneral") Boolean isGeneral, @Param("startDate") String startDate, @Param("endDate") String endDate);
 }

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDon.java

@@ -358,6 +358,8 @@ public class OrderDon extends BaseEntity implements Serializable {
         bz("B站"),
         py("朋友"),
         yh("银河官网"),
+        bd("百度"),
+        whf("无回复"),
         ;
         String desc;
 

netflix-dao/src/main/resources/mapper/OrderDonMapper.xml

@@ -404,9 +404,10 @@
 
     <select id="getRealGoodsSourceData" resultType="com.cyksj.model.views.RealGoodsSourceData">
         select label_source,
-               count(*) as orders,
-               sum(money) as orderMoney
-        from order_don
+        count(*) as orders,
+        sum(money) as orderMoney
+        from order_don o
+        left join user_distribute_shared us on us.user_id = o.user_id
         where goods_id = 15
         and status not in ('close', 'noPayment', 'refund')
         <if test="startDate != null">
@@ -415,6 +416,9 @@
         <if test="endDate != null">
             and created_time &lt; #{endDate}
         </if>
+        <if test="isGeneral != null and isGeneral">
+            and us.id is null
+        </if>
         and label_source != ''
         group by label_source
     </select>

netflix-service/src/main/java/com/cyksj/service/mange/account/CmsAccountServiceImpl.java

@@ -340,8 +340,31 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
 										sb.append(part[i + 1]);
 										i++;
 									}
+									if (part[i].contains("菜")) {
+										sb.append("一道菜");
+										sb.append(Constant.ONE_EMPTY);
+										sb.append(part[i + 1]);
+										i++;
+									}
+									if (part[i].contains("书")) {
+										sb.append("一本书");
+										sb.append(Constant.ONE_EMPTY);
+										sb.append(part[i + 1]);
+										i++;
+									}
+									if (part[i].contains("专辑")) {
+										sb.append("一张专辑");
+										sb.append(Constant.ONE_EMPTY);
+										sb.append(part[i + 1]);
+										i++;
+									}
+								}
+								String string = sb.toString();
+								if (string.contains("菜")) {
+									StringBuilder builder = new StringBuilder();
+									string = builder.append("生日").append(Constant.ONE_EMPTY).append(part[2]).append(Constant.ONE_EMPTY).append(string).toString();
 								}
-								insert.setSecret(sb.toString());
+								insert.setSecret(string);
 							} else {
 								insert.setSecret(Constant.AMERICA_APPID_SECRET);
 							}

netflix-service/src/main/java/com/cyksj/service/mange/statistics/StatisticsDataService.java

@@ -47,5 +47,5 @@ public interface StatisticsDataService {
 
 	void yhShopDistribute(BackgroundDataView backgroundDataView, Date startDate, Date endDate);
 
-	GroupsDataStatisticsView getGroupsData(Long startTime, Long endTime, Integer type) throws Exception;
+	GroupsDataStatisticsView getGroupsData(Long startTime, Long endTime, Integer type, Boolean isDistribute) throws Exception;
 }

netflix-service/src/main/java/com/cyksj/service/mange/statistics/impl/StatisticsDataServiceImpl.java

@@ -404,7 +404,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 	}
 
 	@Override
-	public GroupsDataStatisticsView getGroupsData(Long startTime, Long endTime, Integer type) throws Exception {
+	public GroupsDataStatisticsView getGroupsData(Long startTime, Long endTime, Integer type, Boolean isGeneral) throws Exception {
 		GroupsDataStatisticsView groupsDataStatisticsView = new GroupsDataStatisticsView();
 		String startDate = null;
 		String endDate = null;
@@ -434,10 +434,10 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 				getUnbindChannelOrderData(groupsDataStatisticsView, startDate, endDate);
 				break;
 			case 6:
-				getRealGoodsSourceData(groupsDataStatisticsView, startDate, endDate);
+				getRealGoodsSourceData(groupsDataStatisticsView, isGeneral, startDate, endDate);
 				break;
 			default:
-				getSynthesisData(groupsDataStatisticsView, startDate, endDate);
+				getSynthesisData(groupsDataStatisticsView, isGeneral, startDate, endDate);
 		}
 		return groupsDataStatisticsView;
 	}
@@ -517,7 +517,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		groupsDataStatisticsView.setNewBuyOrderMoney(totalMoney.subtract(groupsDataStatisticsView.getRenewOrderMoney()));
 	}
 
-	public void getSynthesisData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) throws Exception {
+	public void getSynthesisData(GroupsDataStatisticsView groupsDataStatisticsView, Boolean isGeneral, String startDate, String endDate) throws Exception {
 		CountDownLatch latch = new CountDownLatch(2);
 		TASK_POOL.execute(() -> {
 			try {
@@ -532,7 +532,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 				getGroupsOrderCategoryData(groupsDataStatisticsView, startDate, endDate);
 				getRenewOrderData(groupsDataStatisticsView, startDate, endDate);
 				getUnbindChannelOrderData(groupsDataStatisticsView, startDate, endDate);
-				getRealGoodsSourceData(groupsDataStatisticsView, startDate, endDate);
+				getRealGoodsSourceData(groupsDataStatisticsView, isGeneral, startDate, endDate);
 			} finally {
 				latch.countDown();
 			}
@@ -540,8 +540,8 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		latch.await();
 	}
 
-	private void getRealGoodsSourceData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) {
-		List<RealGoodsSourceData> realGoodsSourceDataList = orderDonMapper.getRealGoodsSourceData(startDate, endDate);
+	private void getRealGoodsSourceData(GroupsDataStatisticsView groupsDataStatisticsView, Boolean isGeneral, String startDate, String endDate) {
+		List<RealGoodsSourceData> realGoodsSourceDataList = orderDonMapper.getRealGoodsSourceData(isGeneral, startDate, endDate);
 		Map<String, List<RealGoodsSourceData>> collect = realGoodsSourceDataList.stream().collect(Collectors.groupingBy(RealGoodsSourceData::getLabelSource));
 		OrderDon.LabelSource[] values = OrderDon.LabelSource.values();
 		BigDecimal zero = BigDecimal.ZERO;

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -364,7 +364,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 			//23-12-06 MidJourney 不硬塞
 			if (sku.getNum() > 1 && Constant.AI_goodsIds.get(0) == sku.getGoodsId()) {
 				Integer extraNum = 5;
-				if (sku.getId() == 178l) {
+				if (sku.getId() == 178l || sku.getId() == 423l) {
 					extraNum = 2;
 				}
 				maxNum += extraNum;

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -540,10 +540,10 @@ public class GoodsDonController {
 //		List<Long> filter_goodsIds = getFilterGoodsIds();
 		List<Long> filter_goodsIds = null;
 		AtomicBoolean isRemoveRg = new AtomicBoolean(false);
-		if (isHzIp()) {
-			key += ":hz-ip";
-			isRemoveRg.set(true);
-		}
+//		if (isHzIp()) {
+//			key += ":hz-ip";
+//			isRemoveRg.set(true);
+//		}
 		Long fUid = StpUserUtil.getUserIdAfterLogin();
 		Object o = redisService.get(key);
 		if (o == null) {
@@ -1092,10 +1092,10 @@ public class GoodsDonController {
 		String key = RedisService.key.YH_HOME_PAGHE_CACHE.getEnvName() + "pc:homeManage";
 		//移除奈飞客厅 临时
 		Long filterConfigId = null;
-		if (isHzIp()) {
-			key += ":hz_ip";
-			filterConfigId = 55l;
-		}
+//		if (isHzIp()) {
+//			key += ":hz_ip";
+//			filterConfigId = 55l;
+//		}
 		Object o = redisService.get(key);
 		if (o == null) {
 			MapBuilder builder = MapUtils.builder()

netflix-web/src/main/java/com/cyksj/web/controller/manage/statistics/StatisticsDataController.java

@@ -137,8 +137,8 @@ public class StatisticsDataController {
 	 * type 1销售数据 2自然渠道分类数据 3 渠道商+个人 分类数据 4 续费/非续费数据
 	 */
 	@GetMapping("/get/groupsData")
-	public Result<GroupsDataStatisticsView> getGroupsData(Long startTime, Long endTime, @RequestParam(defaultValue = "0") Integer type) throws Exception {
-		GroupsDataStatisticsView groupsDataStatisticsView = statisticsDataService.getGroupsData(startTime, endTime, type);
+	public Result<GroupsDataStatisticsView> getGroupsData(Long startTime, Long endTime, @RequestParam(defaultValue = "0") Integer type, Boolean isGeneral) throws Exception {
+		GroupsDataStatisticsView groupsDataStatisticsView = statisticsDataService.getGroupsData(startTime, endTime, type, isGeneral);
 		return GatewayResponse.SUCCESS.newBuilder().toResult(groupsDataStatisticsView);
 	}