zoujiajian hai 1 ano
pai
achega
f3dcebbe7e

+ 2 - 2
netflix-dao/src/main/java/com/cyksj/model/entity/UserMirrorShopFeeOrderDon.java

@@ -62,9 +62,9 @@ public class UserMirrorShopFeeOrderDon extends BaseEntity {
 	private String shopId;
 
 	/**
-	 * 上级店铺主自定义id
+	 * 上级店铺主id
 	 */
-	private String customId;
+	private Long mpId;
 
 
 	/**

+ 9 - 1
netflix-service/src/main/java/com/cyksj/service/order/impl/UserMirrorShopOrderServiceImpl.java

@@ -13,6 +13,7 @@ import com.cyksj.config.zfb.BaseZfbConfig;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.channel.ShopConfigMapper;
 import com.cyksj.mapper.mirrorshop.UserMirrorShopFeeOrderDonMapper;
+import com.cyksj.mapper.mirrorshop.UserMirrorShopMapper;
 import com.cyksj.mapper.sys.SysConfigMapper;
 import com.cyksj.model.dto.AliPayParams;
 import com.cyksj.model.dto.UserMirrorShopDistributeConfigDto;
@@ -52,6 +53,8 @@ public class UserMirrorShopOrderServiceImpl implements UserMirrorShopOrderServic
 
 	private final ShopConfigMapper shopConfigMapper;
 
+	private final UserMirrorShopMapper userMirrorShopMapper;
+
 	private final static Sequence SEQUENCE = new Sequence(0);
 
 	@Override
@@ -77,7 +80,12 @@ public class UserMirrorShopOrderServiceImpl implements UserMirrorShopOrderServic
 			userMirrorShopFeeOrderDon.setOpenId(user.getOpenId());
 			feeOrderDonMapper.insert(userMirrorShopFeeOrderDon);
 		}
-		userMirrorShopFeeOrderDon.setCustomId(customId);
+		UserMirrorShop userMirrorShop = userMirrorShopMapper.selectOne(Wrappers.lambdaQuery(UserMirrorShop.class)
+				.eq(UserMirrorShop::getCustomId, customId)
+				.last("limit 1"));
+		if (userMirrorShop != null) {
+			userMirrorShopFeeOrderDon.setMpId(userMirrorShop.getId());
+		}
 		feeOrderDonMapper.updateById(userMirrorShopFeeOrderDon);
 		return userMirrorShopFeeOrderDon;
 	}