fix 过滤镜像店铺车票;GPT镜像同规格续费不处理;银河官网过滤镜像订单

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -439,5 +439,5 @@ public interface Constant {
 	/**
 	 * 镜像店铺默认LOGO
 	 */
-	String USER_MIRROR_SHOP_DEFAULT_LOGO = "https://cdn2.yicanggongyi.com/picture/f6e48d2c854bd38a2ed2cc7d319b524f-1731038450046.webp";
+	String USER_MIRROR_SHOP_DEFAULT_LOGO = "https://cdn2.yicanggongyi.com/picture/08944798d95e42f62f3bb63d8109dcf1-1732169951288.png";
 }

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonView.java

@@ -22,8 +22,10 @@ import java.util.List;
 @Getter
 @Setter
 @SearchBean(tables = "order_don o left join goods_don_sku sku on o.sku_id = sku.id " +
-        "left join goods_don g on g.id = o.goods_id " +
-        "left join order_don_transport odt on odt.order_id = o.id")
+		"left join goods_don g on g.id = o.goods_id " +
+		"left join order_don_transport odt on odt.order_id = o.id " +
+		"left join user_mirror_shop_order_relate ocr on ocr.order_id = o.id",
+		where = "ocr.id is null")
 public class OrderDonView {
 
     @DbField("o.id")

netflix-dao/src/main/java/com/cyksj/model/views/UserMirrorShopView.java

@@ -80,6 +80,9 @@ public class UserMirrorShopView {
 	@DbField("ys.contact")
 	private String contact;
 
+	@DbField("ys.qr_code")
+	private String qrCode;
+
 	@DbField("ys.created_time")
 	private Date createdTime;
 

netflix-dao/src/main/java/com/cyksj/model/views/UserTicketView.java

@@ -46,4 +46,7 @@ public class UserTicketView {
 
 	@DbField("gr.yhs_id")
 	private Long yhsId;
+
+	@DbField("gr.cmt")
+	private Integer cmt;
 }

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -4389,6 +4389,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					if (sku.getMonths() < groupsSku.getMonths() && sku.getGptLimitNum() == groupsSku.getGptLimitNum()) {
 						return;
 					}
+					//同规格续费不处理
+					if (chatgptUser.getRenewSkuId() != null && chatgptUser.getRenewSkuId().equals(order.getSkuId())) {
+						return;
+					}
 					log.info("用户续费升级订单skuId:{}将用户车票relationId:{}套餐续费升级", order.getSkuId(), relationId);
 					chatgptUser.setLimitTime(sku.getGptLimitTime());
 					chatgptUser.setLimitNum(sku.getGptLimitNum());

netflix-web/src/main/java/com/cyksj/web/controller/cps/CpsDistribtueDataController.java

@@ -94,7 +94,7 @@ public class CpsDistribtueDataController {
 		detailView.setReMoney(BigDecimal.valueOf(reMoneyPoints.doubleValue()).divide(thresholdPoints, 2, RoundingMode.DOWN));
 
 		detailView.setWApplyMoney(wApplyMoney);
-		detailView.setGotApplyMoney(BigDecimal.valueOf(gotApplyMoney.doubleValue()).divide(BigDecimal.valueOf(100)));
+		detailView.setGotApplyMoney(BigDecimal.valueOf(gotApplyMoney.doubleValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
 		return GatewayResponse.SUCCESS.newBuilder().toResult(detailView);
 	}
 

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -214,8 +214,10 @@ public class GroupRelationController {
         List<Long> userIds = userBindRelationService.getRelationUserIdList(userId, null);
         List<UserTicketView> ticketViews = beanSearcher.searchAll(UserTicketView.class, MapUtils.flatBuilder(request.getParameterMap())
                 .field(UserTicketView::getUserId, userIds).op(Operator.InList)
-                .field(RenewalView::getStatus, List.of("validity", "outside")).op(Operator.InList)
-                .field(RenewalView::getExpiryTime, DateTime.now()).op(Operator.GreaterThan)
+                .field(UserTicketView::getStatus, List.of("validity", "outside")).op(Operator.InList)
+                .field(UserTicketView::getExpiryTime, DateTime.now()).op(Operator.GreaterThan)
+                //过滤镜像店铺车票
+                .field(UserTicketView::getCmt, 2).op(Operator.NotEqual)
                 .orderBy(UserTicketView::getRelationId).asc()
                 .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(ticketViews);

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/shop/YhShopUserController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -155,7 +156,7 @@ public class YhShopUserController {
 	public Result<YhShopUserDistributeDetailView> getDistributeDetail() {
 		long yhShopUserId = StpYhShopManageUser.getLoginIdAsLong();
 		User user = beanSearcher.searchFirst(User.class, MapUtils.builder().field(User::getId, yhShopUserId).onlySelect(User::getYhsMoney).build());
-		BigDecimal wApplyMoney = user.getYhsMoney().divide(BigDecimal.valueOf(100));
+		BigDecimal wApplyMoney = user.getYhsMoney().divide(BigDecimal.valueOf(100),2, RoundingMode.DOWN);
 		//已提现
 		Number gotApplyMoney = beanSearcher.searchSum(YhShopDistributeMoneyApply.class, MapUtils.builder()
 				.field(YhShopDistributeMoneyApply::getUserId, yhShopUserId)
@@ -171,11 +172,11 @@ public class YhShopUserController {
 		YhShopUserDistributeDetailView detailView = new YhShopUserDistributeDetailView();
 		Map<String, List<YhShopUserDistributeRateView>> collect = rateViews.stream().filter(ct -> StrUtil.isNotBlank(ct.getCategoryName()) && ct.getRate() > 0).collect(Collectors.groupingBy(YhShopUserDistributeRateView::getCategoryName));
 		detailView.setRateViews(collect);
-		detailView.setWMoney(BigDecimal.valueOf(wMoneyPoints.doubleValue()).divide(BigDecimal.valueOf(100)));
-		detailView.setReMoney(BigDecimal.valueOf(reMoneyPoints.doubleValue()).divide(BigDecimal.valueOf(100)));
+		detailView.setWMoney(BigDecimal.valueOf(wMoneyPoints.doubleValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
+		detailView.setReMoney(BigDecimal.valueOf(reMoneyPoints.doubleValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
 
 		detailView.setWApplyMoney(wApplyMoney);
-		detailView.setGotApplyMoney(BigDecimal.valueOf(gotApplyMoney.doubleValue()).divide(BigDecimal.valueOf(100)));
+		detailView.setGotApplyMoney(BigDecimal.valueOf(gotApplyMoney.doubleValue()).divide(BigDecimal.valueOf(100),2, RoundingMode.DOWN));
 		return GatewayResponse.SUCCESS.newBuilder().toResult(detailView);
 	}
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/mirrorshop/manage/CmsUserMirrorShopDataController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -59,7 +60,7 @@ public class CmsUserMirrorShopDataController {
 	public Result<YhShopUserDistributeDetailView> getDistributeDetail() {
 		long yhShopUserId = StpUserMirrorShopManageUser.getLoginIdAsLong();
 		User user = beanSearcher.searchFirst(User.class, MapUtils.builder().field(User::getId, yhShopUserId).onlySelect(User::getMpMoney).build());
-		BigDecimal wApplyMoney = user.getMpMoney().divide(BigDecimal.valueOf(100));
+		BigDecimal wApplyMoney = user.getMpMoney().divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
 		//已提现
 		Number gotApplyMoney = beanSearcher.searchSum(UserMirrorShopDistributeMoneyApply.class, MapUtils.builder()
 				.field(UserMirrorShopDistributeMoneyApply::getUserId, yhShopUserId)
@@ -69,11 +70,11 @@ public class CmsUserMirrorShopDataController {
 		Number wMoneyPoints = beanSearcher.searchSum(UserMirrorShopDistributeWaitingSendPoints.class, MapUtils.builder().field(UserMirrorShopDistributeWaitingSendPoints::getShopUserId, yhShopUserId).field(UserMirrorShopDistributeWaitingSendPoints::getSendStatus, UserMirrorShopDistributeWaitingSendPoints.Status.waiting.name()).build(), "money");
 
 		YhShopUserDistributeDetailView detailView = new YhShopUserDistributeDetailView();
-		detailView.setWMoney(BigDecimal.valueOf(wMoneyPoints.doubleValue()).divide(BigDecimal.valueOf(100)));
-		detailView.setReMoney(BigDecimal.valueOf(reMoneyPoints.doubleValue()).divide(BigDecimal.valueOf(100)));
+		detailView.setWMoney(BigDecimal.valueOf(wMoneyPoints.doubleValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
+		detailView.setReMoney(BigDecimal.valueOf(reMoneyPoints.doubleValue()).divide(BigDecimal.valueOf(100),2,RoundingMode.DOWN));
 
 		detailView.setWApplyMoney(wApplyMoney);
-		detailView.setGotApplyMoney(BigDecimal.valueOf(gotApplyMoney.doubleValue()).divide(BigDecimal.valueOf(100)));
+		detailView.setGotApplyMoney(BigDecimal.valueOf(gotApplyMoney.doubleValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
 		return GatewayResponse.SUCCESS.newBuilder().toResult(detailView);
 	}