zoujiajian hai 1 ano
pai
achega
275fa5b34d

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

@@ -2769,7 +2769,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 	}
 
-	private void handleUserMirrorSHopOrderDon(OrderDon orderDon) {
+	private void handleUserMirrorSHopOrderDon(OrderDon orderDon) throws Exception {
 		Long orderId = orderDon.getId();
 		UserMirrorShopOrderRelate userMirrorShopOrderRelate = userMirrorShopOrderRelateMapper.selectOne(Wrappers.lambdaQuery(UserMirrorShopOrderRelate.class)
 				.eq(UserMirrorShopOrderRelate::getOrderId, orderId)
@@ -2784,7 +2784,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			SysConfig config = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
 					.eq(SysConfig::getSysKey, Constant.MIRROR_SHOP_COMMISSION)
 					.last("limit 1"));
-			UserMirrorShopDistributeConfigDto shopDistributeConfigDto = Jsons.parseObject(config, UserMirrorShopDistributeConfigDto.class);
+			UserMirrorShopDistributeConfigDto shopDistributeConfigDto = Jsons.parseObject(config.getSysValue(), UserMirrorShopDistributeConfigDto.class);
 			Integer consumeRate = shopDistributeConfigDto.getConsumeRate();
 
 			UserMirrorShopDistributeWaitingSendPoints waitingSendPoints = new UserMirrorShopDistributeWaitingSendPoints();

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/mirrorshop/manage/CmsUserMirrorAdvertiseController.java

@@ -50,7 +50,7 @@ public class CmsUserMirrorAdvertiseController {
 		long userId = StpUserMirrorShopManageUser.getLoginIdAsLong();
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (self) {
-			builder.put("uid", String.format(String.format("ua.user_id in (0,%s)"), userId));
+			builder.put("uid", String.format("ua.user_id in (0,%s)", userId));
 		} else {
 			builder.field(UserMirrorShopManageAdvertise::getUserId, 0);
 		}