修改bug：展示团队列表

mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java

@@ -85,7 +85,11 @@ public class PmsProductServiceImpl implements PmsProductService {
         log.info("c"+String.valueOf(product.getProductCategoryId()));
         log.info("d"+String.valueOf(product.getProductAttributeCategoryId()));
         product.setOriginalPrice(productParam.getPrice());
+
         productMapper.insertAll(product);
+        productParam.getSkuStockList().forEach(item->{
+            item.setPrice(product.getPrice());
+        });
         //根据促销类型设置价格：、阶梯价格、满减价格
         Long productId = product.getId();
         //会员价格

mall-dao/src/main/java/com/buy507/mall/mapper/OmsOrderItemMapper.java

@@ -29,4 +29,6 @@ public interface OmsOrderItemMapper {
     int updateByPrimaryKey(OmsOrderItem record);
 
     OmsOrderItem selectByOrderId(Long orderId);
+
+    OmsOrderItem getByOrderSn(String orderSn);
 }

mall-dao/src/main/java/com/buy507/mall/mapper/OmsOrderMapper.java

@@ -33,4 +33,5 @@ public interface OmsOrderMapper {
     int updateByPrimaryKey(OmsOrder record);
 
 
-    PmsProduct selectAll(@Param("orderSn") String orderSn);}
+    PmsProduct selectAll(@Param("orderSn") String orderSn);
+}

mall-dao/src/main/java/com/buy507/mall/model/MemberLevel.java

@@ -31,12 +31,23 @@ public enum MemberLevel {
 		return value;
 	}
 
-	public static MemberLevel getMemberByInt(int value){
+	// 获取根据 ordinal 映射的 MemberLevel
-		for (MemberLevel memberLevel : MemberLevel.values()) {
+	public static MemberLevel fromOrdinal(int ordinal) {
-			if(value == memberLevel.value){
+		MemberLevel[] levels = MemberLevel.values();
-				return memberLevel;
+		if (ordinal >= 0 && ordinal < levels.length) {
+			return levels[ordinal-1];
+		} else {
+			throw new IllegalArgumentException("Invalid ordinal: " + ordinal);
 		}
 	}
-		return null;
+
+	// 根据 value 获取 MemberLevel
+	public static MemberLevel fromValue(int value) {
+		for (MemberLevel level : MemberLevel.values()) {
+			if (level.getValue() == value) {
+				return level;
+			}
+		}
+		throw new IllegalArgumentException("Invalid value: " + value);
 	}
 }

mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransactionExample.java

@@ -361,6 +361,11 @@ public class UmsMemberAccountTransactionExample {
             return (Criteria) this;
         }
 
+        public Criteria andFlowTypeEqualTo(Integer value) {
+            addCriterion("flow_type =", value, "flowType");
+            return (Criteria) this;
+        }
+
         public Criteria andTransactionStateNotEqualTo(Integer value) {
             addCriterion("transaction_state <>", value, "transactionState");
             return (Criteria) this;

mall-dao/src/main/resources/com/buy507/mall/mapper/OmsOrderItemMapper.xml

@@ -513,4 +513,34 @@
     select * from mall.oms_order_item where order_id = #{orderId}
 
   </select>
+    <select id="getByOrderSn" resultType="com.buy507.mall.model.OmsOrderItem">
+        select id,
+               order_id,
+               order_sn,
+               product_id,
+               product_pic,
+               product_name,
+               product_brand,
+               product_sn,
+               product_price,
+               product_quantity,
+               product_sku_id,
+               product_sku_code,
+               product_category_id,
+               promotion_name,
+               promotion_amount,
+               coupon_amount,
+               integration_amount,
+               real_amount,
+               gift_integration,
+               gift_growth,
+               product_attr,
+               sp1,
+               sp2,
+               sp3,
+               intergrationPrice,
+               intergrationExchange
+        from oms_order_item
+        where order_sn = #{orderSn}
+    </select>
 </mapper>

mall-dao/src/main/resources/com/buy507/mall/mapper/OmsOrderMapper.xml

@@ -926,4 +926,5 @@
                JOIN oms_order o ON oi.order_sn = o.order_sn
       WHERE o.order_sn = #{orderSn}
   </select>
+  <select id="getPnameByOrderSn" resultType="java.lang.String"></select>
 </mapper>

mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberAccountTransactionMapper.xml

@@ -109,10 +109,10 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into ums_member_account_transaction (member_id, order_id, revenue_amount, 
-      transaction_state, remarks, commission_ratio,  transfer_payment_time, revenue_points)
+      transaction_state, remarks, commission_ratio,  transfer_payment_time, revenue_points, flow_type)
     values (#{memberId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{revenueAmount,jdbcType=DECIMAL}, 
       #{transactionState,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, #{commissionRatio,jdbcType=INTEGER}, 
-      #{transferPaymentTime,jdbcType=TIMESTAMP}, #{revenuePoints,jdbcType=INTEGER})
+      #{transferPaymentTime,jdbcType=TIMESTAMP}, #{revenuePoints,jdbcType=INTEGER}, #{flowType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.buy507.mall.model.UmsMemberAccountTransaction">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">

mall-portal/pom.xml

@@ -80,7 +80,7 @@
 
 		<!-- 微信小程序支付 -->
         <dependency>
-		    <groupId>org.apache.commons</groupId>
+		    <groupId>commons-io</groupId>
 		    <artifactId>commons-io</artifactId>
 		    <version>1.3.2</version>
 		</dependency>

mall-portal/src/main/java/com/buy507/mall/portal/domain/OrderResult.java

@@ -119,6 +119,17 @@ public class OrderResult {
 	@ApiModelProperty(value = "积分兑换专区")
 	private Integer intergrationExchange;
 
+	@ApiModelProperty(value = "订单类型")
+	private Integer orderType;
+
+	public Integer getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(Integer orderType) {
+		this.orderType = orderType;
+	}
+
 	public Integer getIntergrationExchange() {
 		return intergrationExchange;
 	}

mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -336,39 +336,39 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         OrderResult orderResult = new OrderResult();
         OmsOrder order = orderMapper.selectByPrimaryKey(orderId);
         //删除状态：0->未删除；1->已删除
-		if(order != null && order.getMemberId().equals(loginMember.getId()) && order.getDeleteStatus() == 0) {
+        if (order != null && order.getMemberId().equals(loginMember.getId()) && order.getDeleteStatus() == 0) {
             orderResult.setOrderId(order.getId());
             orderResult.setOrderSn(order.getOrderSn());
             orderResult.setCreateTime(order.getCreateTime());
             orderResult.setPayAmount(order.getPayAmount());
             orderResult.setOrderStatus(order.getStatus());
             orderResult.setDeliveryType(order.getDeliveryType());
-			if(order.getStatus() == 0) {
+            if (order.getStatus() == 0) {
                 orderResult.setOrderStatusName("待付款");
-				if(order.getPayType() != null && order.getPayType() == 3) {
+                if (order.getPayType() != null && order.getPayType() == 3) {
                     orderResult.setOrderStatusName("已付款待审核");
                 }
             }
-			if(order.getStatus() == 1) {
+            if (order.getStatus() == 1) {
                 orderResult.setOrderStatusName("待发货");
             }
-			if(order.getStatus() == 2) {
+            if (order.getStatus() == 2) {
                 // 提货方式：0->自提；1->物流
-				if(order.getDeliveryType() == 0) {
+                if (order.getDeliveryType() == 0) {
                     orderResult.setOrderStatusName("待提货");
                 } else {
                     orderResult.setOrderStatusName("待收货");
                 }
             }
-			if(order.getStatus() == 3) {
+            if (order.getStatus() == 3) {
                 orderResult.setOrderStatusName("交易完成");
-				if(order.getCommentTime() == null) {
+                if (order.getCommentTime() == null) {
                     orderResult.setCommentStatus(0); //未评价
                 } else {
                     orderResult.setCommentStatus(1); //已评价
                 }
             }
-			if(order.getStatus() == 4) {
+            if (order.getStatus() == 4) {
                 orderResult.setOrderStatusName("交易关闭");
                 orderResult.setOrderStatus(4);
             }
@@ -377,7 +377,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             orderResult.setNote(order.getNote());
             orderResult.setDeliveryCompany(order.getDeliveryCompany());
             orderResult.setDeliverySn(order.getDeliverySn());
-			orderResult.setPaymentTime(order.getPaymentTime());
+            orderResult.setOrderType(order.getOrderType());
+            orderResult.setPaymentTime(new Date());
 
             // 获取商品信息，判断是否是积分专区商品
             PmsProduct product = productMapper.getProductByOrderSn(order.getOrderSn());
@@ -386,14 +387,14 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
             //支付类型: 0->未支付；1->支付宝；2->微信; 3->线下支付; 4->积分支付
             //判断是否为积分专区商品
-			if(isPointsExchangeStatus) {
+            if (isPointsExchangeStatus) {
                 orderResult.setIntergrationPrice(product.getIntergrationPrice());
                 orderResult.setIntergrationExchange(product.getPointsExchangeStatus());
                 orderResult.setPayType(order.getPayType());
                 if (order.getPayType() == 0) {
                     orderResult.setPayTypeName("未支付");
                 }
-				}else {
+            } else {
                 // 如果不是积分兑换专区商品，则继续使用其他支付方式
                 if (order.getPayType() != null) {
                     orderResult.setPayType(order.getPayType());
@@ -432,11 +433,11 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             orderResult.setOrderStatus(0);
 
             //0->不开发票；1->电子发票；2->纸质发票
-			if(order.getBillType() != null) {
+            if (order.getBillType() != null) {
                 orderResult.setBillType(order.getBillType());
-				if(order.getBillType() == 1) {
+                if (order.getBillType() == 1) {
                     orderResult.setBillTypeName("电子发票");
-				} else if(order.getBillType() == 2) {
+                } else if (order.getBillType() == 2) {
                     orderResult.setBillTypeName("纸质发票");
                 } else {
                     orderResult.setBillTypeName("不开发票");
@@ -462,7 +463,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             OrderItemResult orderItemResult = null;
             orderResult.setProductsNum(orderItemList.size());
             List<OrderItemResult> orderItemResultList = new ArrayList<>();
-			for(OmsOrderItem orderItem : orderItemList) {
+            for (OmsOrderItem orderItem : orderItemList) {
                 orderItemResult = new OrderItemResult();
                 orderItemResult.setOrderId(order.getId());
                 orderItemResult.setOrderSn(order.getOrderSn());
@@ -751,30 +752,30 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
      */
     public CommonResult createOrder(OrderParam orderParam) {
         //orderParam.setSkuId(98L);
-		if(orderParam.getSkuId() == null) {
+        if (orderParam.getSkuId() == null) {
             return CommonResult.validateFailed("商品SKU不能为空");
         }
 
-		if(orderParam.getDeliveryType() == null || (orderParam.getDeliveryType() != 0 && orderParam.getDeliveryType() != 1) ) {
+        if (orderParam.getDeliveryType() == null || (orderParam.getDeliveryType() != 0 && orderParam.getDeliveryType() != 1)) {
             return CommonResult.validateFailed("提货方式不能为空");
         }
 
-		if(orderParam.getMemberReceiveAddressId() == null) {
+        if (orderParam.getMemberReceiveAddressId() == null) {
             return CommonResult.validateFailed("会员收货地址不能为空");
         }
 
         UmsMemberReceiveAddress address = memberReceiveAddressMapper.selectOneById(orderParam.getMemberReceiveAddressId());
-        if(address == null) {
+        if (address == null) {
             return CommonResult.validateFailed("未查询到会员收货地址");
         }
-		if(orderParam.getQuantity() == null) {
+        if (orderParam.getQuantity() == null) {
             return CommonResult.validateFailed("商品数量不能为空");
         }
-		if(orderParam.getQuantity() <= 0) {
+        if (orderParam.getQuantity() <= 0) {
             return CommonResult.validateFailed("商品数量错误");
         }
         PmsSkuStock skuStock = skuStockMapper.selectByPrimaryKey(orderParam.getSkuId());
-		if(skuStock == null) {
+        if (skuStock == null) {
             return CommonResult.validateFailed("未查询到商品信息");
         }
 
@@ -800,12 +801,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         }
 
         Map<String, Object> result = new HashMap<>();
-		if(product != null) {
+        if (product != null) {
 
             UmsMember member = memberMapper.selectByPrimaryKey(memberService.getCurrentMember().getId());
             BigDecimal discount = commonService.getDiscount(member.getId());
 
-	    	if(discount != null) {
+            if (discount != null) {
                 price = skuStock.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP);
             }
 
@@ -813,7 +814,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             BigDecimal zero = new BigDecimal(0);
             totalAmount = price.multiply(new BigDecimal(orderParam.getQuantity()));
 
-	        if(orderParam.getIntegration() == null) {
+            if (orderParam.getIntegration() == null) {
                 orderParam.setIntegration(zero);
             }
 
@@ -822,7 +823,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             //flag = -1,表示integration小于0；flag = 0,表示integration等于0；flag = 1,表示integration大于0；
             //int integerationFlag = orderParam.getIntegration().compareTo(new BigDecimal(0)); //mcoo
             int integerationFlag = 0;
-			if(integerationFlag == 1) {
+            if (integerationFlag == 1) {
                 int flag = member.getBalance().compareTo(orderParam.getIntegration());
                 //flag = -1,表示balance小于integration；flag = 0,表示balance等于integration；flag = 1,表示balance大于integration；
 				/*if(flag == -1) {
@@ -830,9 +831,9 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 				}*/
             }
 
-			while(true) {
+            while (true) {
                 long time = System.currentTimeMillis() + RedisLock.TIMEOUT;
-				if(redisLock.lock(String.valueOf(skuStock.getProductId()), String.valueOf(time))) {
+                if (redisLock.lock(String.valueOf(skuStock.getProductId()), String.valueOf(time))) {
 
                     //重新查询获取最新的数据
                     skuStock = skuStockMapper.selectByPrimaryKey(orderParam.getSkuId());
@@ -855,13 +856,13 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             order.setTotalAmount(totalAmount); // 订单总金额
             order.setIntegrationAmount(zero);  // 积分部分金额设为零
             order.setIntegrationAmount(orderParam.getIntegration() == null ? zero : orderParam.getIntegration());
-			if(integerationFlag == 1) {
+            if (integerationFlag == 1) {
                 int flag = orderParam.getIntegration().compareTo(totalAmount);
                 BigDecimal integeration = new BigDecimal(0);
                 //flag = -1,表示integration小于totalAmount；flag = 0,表示integration等于totalAmount；flag = 1,表示integration大于totalAmount；
                 //如果传入的积分小于实际支付金额，用实际支付金额减去抵扣积分。
                 //如果传入的积分等于或者大于实际支付金额，表示全额抵扣
-				if(flag == -1) {
+                if (flag == -1) {
                     order.setPayAmount(totalAmount.subtract(orderParam.getIntegration())); //实际支付金额
                     order.setIntegrationAmount(orderParam.getIntegration());
                     integeration = orderParam.getIntegration();
@@ -1360,7 +1361,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         // 判断是否使用积分支付
         UmsMember member = memberMapper.selectByPrimaryKey(currentMember.getId());
 
-        if(product1.getPointsExchangeStatus() == 1) {
+        if (product1.getPointsExchangeStatus() == 1) {
 
             // 获取积分兑换价格
             // 使用订单中的积分字段
@@ -1402,6 +1403,17 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                 updateStock(orderId);
             });
 
+            //插入流水表积分
+            UmsMemberAccountTransaction accountTransaction = new UmsMemberAccountTransaction();
+            accountTransaction.setMemberId(member.getId());
+            accountTransaction.setOrderId(orderId);
+            accountTransaction.setFlowType(2);
+            accountTransaction.setTransferPaymentTime(order.getPaymentTime());
+            accountTransaction.setRevenuePoints(-totalPointsAmount.intValue());
+            PmsProduct pmsProduct = orderMapper.selectAll(order.getOrderSn());
+            accountTransaction.setRemarks("商品名称" + pmsProduct.getName());
+            umsMemberAccountTransactionMapper.insert(accountTransaction);
+
             // 返还积分金额到前端
             return CommonResult.success(totalPointsAmount, "支付成功");
 
@@ -1442,16 +1454,6 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 //                return CommonResult.validateFailed("无效订单");
 //            }
 //
-//            //插入流水表
-//            UmsMemberAccountTransaction accountTransaction = new UmsMemberAccountTransaction();
-//            accountTransaction.setMemberId(member.getId());
-//            accountTransaction.setOrderId(orderId);
-//            accountTransaction.setTransferPaymentTime(order.getPaymentTime());
-//            accountTransaction.setRevenuePoints(totalPointsAmount.intValue());
-//            PmsProduct pmsProduct = orderMapper.selectAll(order.getOrderSn());
-//            accountTransaction.setRemarks( "商品名称" + pmsProduct.getName());
-//            umsMemberAccountTransactionMapper.insert(accountTransaction);
-//
 //            Date date = new Date();
 //
 //            //支付方式：0->未支付；1->支付宝；2->微信；3->线下支付；4->余额支付
@@ -1568,12 +1570,20 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         UmsMemberAccountTransaction accountTransaction = new UmsMemberAccountTransaction();
         accountTransaction.setMemberId(member.getId());
         accountTransaction.setOrderId(orderId);
+        accountTransaction.setFlowType(1);
         accountTransaction.setTransferPaymentTime(orderResult.getPaymentTime());
         accountTransaction.setRevenueAmount(payAmount.negate());
-        PmsProduct pmsProduct = orderMapper.selectAll(orderResult.getOrderSn());
+        OmsOrderItem orderItem = orderItemMapper.getByOrderSn(orderResult.getOrderSn());
-        accountTransaction.setRemarks( "商品名称" + pmsProduct.getName());
+        accountTransaction.setRemarks("商品名称" + orderItem.getProductName());
         umsMemberAccountTransactionMapper.insert(accountTransaction);
 
+        PmsProduct pmsProduct = orderMapper.selectAll(orderResult.getOrderSn());
+        if (pmsProduct.getVipStatus() == 1) {
+            //增加基金现金
+            BigDecimal fundCash = payAmount.multiply(new BigDecimal("0.05"));
+            umsDevelopmentFundMapper.updateCash(fundCash);
+        }
+
         //如果是积分专区的商品则进行积分专区相对应的逻辑
         if (pmsProduct.getPointsAreaStatus() == 1) {
             //奖励积分是购买的价格的100%
@@ -1590,21 +1600,38 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                 // 更新用户积分
                 memberMapper.updateByPrimaryKey(member);
                 //增加基金积分
-                int fundPoints = (int)(rewardPoints * 0.05);
+                int fundPoints = (int) (rewardPoints * 0.05);
                 umsDevelopmentFundMapper.updatePoints(fundPoints);
-
+                //插入流水表积分
-//                //积分分润逻辑
+                UmsMemberAccountTransaction transaction = new UmsMemberAccountTransaction();
-//                memberPointsSplitProfitService.pointsSplit(order);
+                transaction.setMemberId(member.getId());
+                transaction.setOrderId(orderId);
+                transaction.setFlowType(2);
+                transaction.setTransferPaymentTime(orderResult.getPaymentTime());
+                transaction.setRevenuePoints(rewardPoints);
+                transaction.setRemarks("购买商品返还积分：" + pmsProduct.getName());
+                umsMemberAccountTransactionMapper.insert(transaction);
             }
         }
         // 更新订单状态为已支付
         OmsOrder order = orderMapper.selectByPrimaryKey(orderId);
+
         // 设置为余额支付
         order.setPayType(5);
         // 设置订单状态为已支付
         order.setStatus(2);
         order.setPaymentTime(new Date());
         orderMapper.updateByPrimaryKey(order);
+        //如果积分专区则需要积分分润
+        if (pmsProduct.getPointsAreaStatus() == 1) {
+            //积分分润逻辑
+            memberPointsSplitProfitService.pointsSplit(order);
+        }
+        //如果会员专区专区则需要判断升级和金额分润
+        if (pmsProduct.getVipStatus() == 1) {
+            //升级现金分润逻辑
+            memberSplitProfitService.updateOderAndMemberInfo(order);
+        }
 
         // 处理库存、分销等后续操作
         executorService.execute(() -> {
@@ -1616,7 +1643,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
     }
 
     /**
-     *处理库存的逻辑
+     * 处理库存的逻辑
      */
     private void updateStock(Long orderId) {
         // 查询订单商品信息，进行库存更新等操作
@@ -1634,8 +1661,6 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
     }
 
 
-
-
     /**
      * 微信预支付
      *
@@ -2049,9 +2074,19 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                             // 更新用户积分
                             memberMapper.updateByPrimaryKey(member);
                             //增加基金积分
-                            int fundPoints = (int)(rewardPoints * 0.05);
+                            int fundPoints = (int) (rewardPoints * 0.05);
                             umsDevelopmentFundMapper.updatePoints(fundPoints);
 
+                            //插入流水表积分
+                            UmsMemberAccountTransaction accountTransaction = new UmsMemberAccountTransaction();
+                            accountTransaction.setMemberId(member.getId());
+                            accountTransaction.setOrderId(order.getId());
+                            accountTransaction.setFlowType(2);
+                            accountTransaction.setTransferPaymentTime(order.getPaymentTime());
+                            accountTransaction.setRevenuePoints(rewardPoints);
+                            accountTransaction.setRemarks("购买商品返还积分：" + pmsProduct.getName());
+                            umsMemberAccountTransactionMapper.insert(accountTransaction);
+
                             //积分分润逻辑
                             memberPointsSplitProfitService.pointsSplit(order);
                         }

mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java

@@ -240,7 +240,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 
         //获取默认会员等级并设置
         UmsMemberLevelExample levelExample = new UmsMemberLevelExample();
-        levelExample.createCriteria().andDefaultStatusEqualTo(0);
+        levelExample.createCriteria().andDefaultStatusEqualTo(1);
         List<UmsMemberLevel> memberLevelList = memberLevelMapper.selectByExample(levelExample);
         if (!CollectionUtils.isEmpty(memberLevelList)) {
             umsMember.setMemberLevelId(memberLevelList.get(0).getId());
@@ -516,6 +516,8 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 	public MemberInfoResult  getMemberInfo() {
 		UmsMember loginMember =  getCurrentMember();
 		UmsMember member = memberMapper.selectByPrimaryKey(loginMember.getId());
+        MemberLevel memberLevel = MemberLevel.fromOrdinal(loginMember.getMemberLevelId().intValue());
+        member.setMemberLevel(memberLevel);
 		DmsTeamTotalConsume teamTotalConsume = teamTotalConsumeMapper.selectOneByMemberId(loginMember.getId());
 		
 		OmsOrderExample example = new OmsOrderExample();
@@ -529,6 +531,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
         BigDecimal totalIncome = BigDecimal.ZERO;
         accountTransactionExample.createCriteria()
                 .andTransactionStateEqualTo(UmsMemberAccountTransaction.TRANSACTION_STATE_YES)
+                .andFlowTypeEqualTo(1)
                 .andMemberIdEqualTo(member.getId());
 
         List<UmsMemberAccountTransaction> totalList = umsMemberAccountTransactionMapper.selectByExample(accountTransactionExample);
@@ -546,6 +549,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
         accountTransactionExample.createCriteria()
                 .andTransferPaymentTimeBetween(DateUtil.beginOfDay(nowTime) ,nowTime)
                 .andTransactionStateEqualTo(UmsMemberAccountTransaction.TRANSACTION_STATE_YES)
+                .andFlowTypeEqualTo(1)
                 .andMemberIdEqualTo(member.getId());
         List<UmsMemberAccountTransaction> todayIncomeList = umsMemberAccountTransactionMapper.selectByExample(accountTransactionExample);
         if(todayIncomeList!= null && !todayIncomeList.isEmpty()){
@@ -566,7 +570,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 		result.setNickname(member.getNickname() == null ? "" : member.getNickname());
 		result.setHeadPicture(member.getIcon() == null ? "" :member.getIcon());
 		result.setGender(member.getGender());
-		result.setMemberLevel(member.getMemberLevel().getValue()-1);
+		result.setMemberLevel(member.getMemberLevel().getValue());
 		result.setMemberId(loginMember.getId());
 		result.setRealName(member.getRealName());
 		result.setDetailAddress(member.getDetailAddress());
@@ -924,7 +928,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 		String withdrawMultipleStr = commonService.getDictionaryValue(Constants.D_WITHDRAW_MULTIPLE);
 		double withdrawMultiple = Double.valueOf(withdrawMultipleStr);
 		if(applyParam.getValue() % withdrawMultiple != 0) {
-			return CommonResult.validateFailed("提现积分必须是" + withdrawMultipleStr + "的倍数");
+			return CommonResult.validateFailed("提现金额必须是" + withdrawMultipleStr + "的倍数");
 		}
 		
 		BigDecimal withdraw = new BigDecimal(applyParam.getValue());
@@ -933,7 +937,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 		//flag = -1,表示balance小于withdraw；flag = 0,表示balance等于withdraw；flag = 1,表示balance大于withdraw；
 		int flag = member.getBalance().compareTo(withdraw);
 		if(flag == -1) {
-			return CommonResult.validateFailed("积分不足，不能提现");
+			return CommonResult.validateFailed("余额不足，不能提现");
 		}
 		
 		while(true) {
@@ -943,7 +947,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 				//flag = -1,表示balance小于withdraw；flag = 0,表示balance等于withdraw；flag = 1,表示balance大于withdraw；
 				flag = member.getBalance().compareTo(withdraw);
 				if(flag == -1) {
-					return CommonResult.validateFailed("积分不足，不能提现");
+					return CommonResult.validateFailed("余额不足，不能提现");
 				}
 				member.setBalance(member.getBalance().subtract(withdraw)); //修改余额值
 				member.setFreeze(member.getFreeze().add(withdraw)); //修改冻结值

mall-portal/src/main/java/com/buy507/mall/portal/service/impl/VipCenterServiceImpl.java

@@ -83,6 +83,7 @@ public class VipCenterServiceImpl implements VipCenterService {
             //返回订单id
             Map<String, Object> result = new HashMap<>();
             result.put("orderId", order.getId());
+            result.put("orderType", order.getOrderType());
             return CommonResult.success(result, "下单成功");
         }
     }

mall-portal/src/main/resources/application-prod.yml

@@ -106,8 +106,8 @@ becomeVipAmount: 899
 # 同等级分润比例
 sameLevelProfit: 10
 #店长升级金额
-storeManagerAmount: 1000
+storeManagerAmount: 10000
 #代理升级金额
-agentAmount: 1000
+agentAmount: 50000
 #市代理升级金额
-cityAgentAmount: 1000
+cityAgentAmount: 100000

mall-portal/src/main/resources/dao/PortalMemberDao.xml

@@ -4,14 +4,14 @@
 
 	<select id="selectMemberTeamList" parameterType="java.lang.Long" resultType="com.buy507.mall.portal.domain.TeamMemberResult">
         SELECT 
-        	   (SELECT nickname FROM ums_member m where m.id = tl.member_id) as username, 
+        	   (SELECT nickname FROM ums_member m where m.id = ur.member_id) as username,
-               tl.member_id as memberId,
+               ur.member_id as memberId,
-               IFNULL((SELECT total FROM dms_team_member_number tmn where tmn.member_id = tl.member_id), 0) as teamNum,
+               IFNULL((SELECT total FROM dms_team_member_number tmn where tmn.member_id = ur.member_id), 0) as teamNum,
-               (SELECT value FROM dms_team_total_consume ttc where ttc.member_id = tl.member_id) as teamConsume
+               (SELECT value FROM dms_team_total_consume ttc where ttc.member_id = ur.member_id) as teamConsume
           FROM
-            dms_team_level tl
+              ums_member_relation_tree ur
         WHERE
-            tl.parent_id = #{member_id}
+            ur.higher_level_id = #{member_id}
     </select>
     
     <select id="selectMemberWithdrawApplyList" parameterType="java.lang.Long" resultType="java.util.HashMap">