Merge remote-tracking branch 'origin/main-zhb'

# Conflicts: # mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java # mall-dao/src/main/java/com/buy507/mall/mapper/PmsProductMapper.java # mall-dao/src/main/resources/com/buy507/mall/mapper/PmsProductMapper.xml
Merge pull request 'main-cx' (#15 ) from main-cx into main
2025-02-26 10:40:51 +08:00 · 2025-02-26 10:36:15 +08:00 · 2025-02-26 10:36:03 +08:00 · 2025-02-26 10:35:39 +08:00 · 2025-02-26 10:34:54 +08:00 · 2025-02-22 15:59:12 +08:00
36 changed files with 779 additions and 360 deletions
--- a/mall-admin/pom.xml
+++ b/mall-admin/pom.xml
@@ -66,6 +66,7 @@
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <optional>true</optional>
+            <version>1.18.20</version>
        </dependency>
        
        <!-- poi excel -->
--- a/mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java
+++ b/mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java
@@ -84,7 +84,8 @@ public class PmsProductServiceImpl implements PmsProductService {
        log.info("b"+String.valueOf(productParam.getProductAttributeCategoryId()));
        log.info("c"+String.valueOf(product.getProductCategoryId()));
        log.info("d"+String.valueOf(product.getProductAttributeCategoryId()));
-        productMapper.insertSelective(product);
+        product.setOriginalPrice(productParam.getPrice());
+        productMapper.insertAll(product);
        //根据促销类型设置价格：、阶梯价格、满减价格
        Long productId = product.getId();
        //会员价格
--- a/mall-dao/src/main/java/com/buy507/mall/mapper/OmsOrderItemMapper.java
+++ b/mall-dao/src/main/java/com/buy507/mall/mapper/OmsOrderItemMapper.java
@@ -27,4 +27,6 @@ public interface OmsOrderItemMapper {
    int updateByPrimaryKeySelective(OmsOrderItem record);

    int updateByPrimaryKey(OmsOrderItem record);
+
+    OmsOrderItem selectByOrderId(Long orderId);
 }
--- a/mall-dao/src/main/java/com/buy507/mall/mapper/PmsProductMapper.java
+++ b/mall-dao/src/main/java/com/buy507/mall/mapper/PmsProductMapper.java
@@ -7,6 +7,7 @@ import com.buy507.mall.model.PmsProductFullReduction;
 import java.util.HashMap;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;

 public interface PmsProductMapper {
    long countByExample(PmsProductExample example);
@@ -23,7 +24,9 @@ public interface PmsProductMapper {

    List<PmsProduct> selectByExample(PmsProductExample example);

+//    @Select("select * from pms_product where id = #{id}")
    PmsProduct selectByPrimaryKey(Long id);
+
    int updateByExampleSelective(@Param("record") PmsProduct record, @Param("example") PmsProductExample example);

    int updateByExampleWithBLOBs(@Param("record") PmsProduct record, @Param("example") PmsProductExample example);
@@ -40,7 +43,8 @@ public interface PmsProductMapper {

    PmsProduct getProductByOrderSn(String orderSn);

+    PmsProduct getPrimaryKey(Long id);


-
+    int insertAll(PmsProduct product);
 }
--- a/mall-dao/src/main/java/com/buy507/mall/mapper/PmsSkuStockMapper.java
+++ b/mall-dao/src/main/java/com/buy507/mall/mapper/PmsSkuStockMapper.java
@@ -29,4 +29,5 @@ public interface PmsSkuStockMapper {
    int updateByPrimaryKey(PmsSkuStock record);
    
    List<PmsSkuStock> getPmsSkuStock(Long id);
+
 }
--- a/mall-dao/src/main/java/com/buy507/mall/mapper/UmsDevelopmentFundMapper.java
+++ b/mall-dao/src/main/java/com/buy507/mall/mapper/UmsDevelopmentFundMapper.java
@@ -43,6 +43,13 @@ public interface UmsDevelopmentFundMapper {
     */
    @Update("update ums_development_fund set cash_total = cash_total + #{fundCash}")
    void updateCash(BigDecimal fundCash);
+
+    /**
+     * 发展基金
+     * @return
+     */
+    @Select("select id, cash_total, points_total, updated_at from ums_development_fund")
+    UmsDevelopmentFund selectAll();
 }


--- a/mall-dao/src/main/java/com/buy507/mall/model/OmsOrderItem.java
+++ b/mall-dao/src/main/java/com/buy507/mall/model/OmsOrderItem.java
@@ -69,6 +69,8 @@ public class OmsOrderItem implements Serializable {
    @ApiModelProperty(value = "商品销售属性:[{'key':'颜色','value':'颜色'},{'key':'容量','value':'4G'}]")
    private String productAttr;

+
+
    private static final long serialVersionUID = 1L;

    public Long getId() {
--- a/mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java
+++ b/mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java
@@ -664,7 +664,7 @@ public class PmsProduct implements Serializable {

    public void setVipCenter(Integer vipCenter) {this.vipCenter = vipCenter;}

-    public Integer getintergrationPrice() {return intergrationPrice;}
+    public Integer getIntergrationPrice() {return intergrationPrice;}

    public void setIntergrationPrice(Integer intergrationPrice) {this.intergrationPrice = intergrationPrice;}

--- a/mall-dao/src/main/java/com/buy507/mall/model/UmsDevelopmentFund.java
+++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsDevelopmentFund.java
@@ -36,6 +36,38 @@ public class UmsDevelopmentFund implements Serializable {
     */
    private Date updatedAt;

+    public Integer getPointsTotal() {
+        return pointsTotal;
+    }
+
+    public void setPointsTotal(Integer pointsTotal) {
+        this.pointsTotal = pointsTotal;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public BigDecimal getCashTotal() {
+        return cashTotal;
+    }
+
+    public void setCashTotal(BigDecimal cashTotal) {
+        this.cashTotal = cashTotal;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
    @Override
    public String toString() {
        return "UmsDevelopmentFund{" +
--- a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransaction.java
+++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransaction.java
@@ -44,6 +44,17 @@ public class UmsMemberAccountTransaction implements Serializable {
    @ApiModelProperty(value = "进账积分")
    private Integer revenuePoints;

+    public Integer getFlowType() {
+        return flowType;
+    }
+
+    public void setFlowType(Integer flowType) {
+        this.flowType = flowType;
+    }
+
+    @ApiModelProperty(value = "流水类型")
+    private Integer flowType;
+
    private static final long serialVersionUID = 1L;

    public Long getId() {
@@ -139,6 +150,7 @@ public class UmsMemberAccountTransaction implements Serializable {
                ", createTime=" + createTime +
                ", transferPaymentTime=" + transferPaymentTime +
                ", revenuePoints=" + revenuePoints +
+                ", flowType=" + flowType +
                '}';
    }
 }
--- a/mall-dao/src/main/resources/com/buy507/mall/mapper/OmsOrderItemMapper.xml
+++ b/mall-dao/src/main/resources/com/buy507/mall/mapper/OmsOrderItemMapper.xml
@@ -89,7 +89,7 @@
    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,
    sp1, sp2, sp3, promotion_name, promotion_amount, coupon_amount, integration_amount,
-    real_amount, gift_integration, gift_growth, product_attr
+    real_amount, gift_integration, gift_growth, product_attr,intergrationPrice,intergrationExchange
  </sql>
  <select id="selectByExample" parameterType="com.buy507.mall.model.OmsOrderItemExample" resultMap="BaseResultMap">
    select
@@ -508,4 +508,9 @@
        product_attr = #{productAttr,jdbcType=VARCHAR}
    where id = #{id,jdbcType=BIGINT}
  </update>
+
+  <select id="selectByOrderId" resultType="com.buy507.mall.model.OmsOrderItem">
+    select * from mall.oms_order_item where order_id = #{orderId}
+
+  </select>
 </mapper>
--- a/mall-dao/src/main/resources/com/buy507/mall/mapper/OmsOrderMapper.xml
+++ b/mall-dao/src/main/resources/com/buy507/mall/mapper/OmsOrderMapper.xml
@@ -148,7 +148,7 @@
      <include refid="Example_Where_Clause" />
    </if>
  </delete>
-  <insert id="insert" parameterType="com.buy507.mall.model.OmsOrder">
+  <insert id="insert" useGeneratedKeys="true" parameterType="com.buy507.mall.model.OmsOrder">
    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
      SELECT LAST_INSERT_ID()
    </selectKey>
--- a/mall-dao/src/main/resources/com/buy507/mall/mapper/PmsProductMapper.xml
+++ b/mall-dao/src/main/resources/com/buy507/mall/mapper/PmsProductMapper.xml
@@ -112,7 +112,7 @@
    verify_status, sort, sale, price, promotion_price, gift_growth, gift_point, use_point_limit, 
    sub_title, original_price, stock, low_stock, unit, weight, preview_status, service_ids, 
    keywords, note, album_pics, detail_title, promotion_start_time, promotion_end_time, 
-    promotion_per_limit, promotion_type, brand_name, product_category_name, distribution_flag
+    promotion_per_limit, promotion_type, brand_name, product_category_name, distribution_flag,vip_status,points_area_status,points_exchange_status,intergration_price
  </sql>
  <sql id="Blob_Column_List">
    description, detail_desc, detail_html, detail_mobile_html
@@ -336,6 +336,9 @@
      <if test="detailMobileHtml != null">
        detail_mobile_html,
      </if>
+      <if test="intergrationPrice != null">
+        intergration_price,
+      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="brandId != null">
@@ -461,6 +464,9 @@
      <if test="detailMobileHtml != null">
        #{detailMobileHtml,jdbcType=LONGVARCHAR},
      </if>
+    <if test="intergrationPrice != null">
+      #{intergration_price},
+    </if>
    </trim>
  </insert>
  <select id="countByExample" parameterType="com.buy507.mall.model.PmsProductExample" resultType="java.lang.Long">
@@ -934,10 +940,118 @@
    SELECT p.*
    FROM pms_product p
    WHERE p.product_sn = (
-      SELECT oi.product_sn
+      SELECT DISTINCT oi.product_sn
      FROM oms_order_item oi
      WHERE oi.order_sn = #{orderSn}
-      LIMIT 1
-      )
+        AND oi.product_sn IS NOT NULL
+      limit 1
+    );
  </select>
+
+  <select id="getPrimaryKey" resultType="com.buy507.mall.model.PmsProduct">
+    SELECT p.id,
+           p.brand_id,
+           p.product_category_id,
+           p.feight_template_id,
+           p.product_attribute_category_id,
+           p.name,
+           p.pic,
+           p.product_sn,
+           p.delete_status,
+           p.publish_status,
+           p.new_status,
+           p.recommand_status,
+           p.verify_status,
+           p.sort,
+           p.sale,
+           p.price,
+           p.promotion_price,
+           p.gift_growth,
+           p.gift_point,
+           p.use_point_limit,
+           p.sub_title,
+           p.description,
+           p.original_price,
+           p.stock,
+           p.low_stock,
+           p.unit,
+           p.weight,
+           p.preview_status,
+           p.service_ids,
+           p.keywords,
+           p.note,
+           p.album_pics,
+           p.detail_title,
+           p.detail_desc,
+           p.detail_html,
+           p.detail_mobile_html,
+           p.promotion_start_time,
+           p.promotion_end_time,
+           p.promotion_per_limit,
+           p.promotion_type,
+           p.brand_name,
+           p.product_category_name,
+           p.distribution_flag,
+           p.vip_status,
+           p.points_area_status,
+           p.points_exchange_status,
+           p.intergration_price
+    FROM pms_product p
+
+    WHERE id = #{id}
+  </select>
+
+  <insert id="insertAll" useGeneratedKeys="true" parameterType="com.buy507.mall.model.PmsProduct">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    INSERT INTO pms_product
+    SET
+      brand_id = #{brandId},
+      product_category_id = #{productCategoryId},
+      feight_template_id = #{feightTemplateId},
+      product_attribute_category_id = #{productAttributeCategoryId},
+      name = #{name},
+      pic = #{pic},
+      product_sn = #{productSn},
+      delete_status = #{deleteStatus},
+      publish_status = #{publishStatus},
+      new_status = #{newStatus},
+      vip_status = #{vipStatus},
+      points_area_status = #{pointsAreaStatus},
+      points_exchange_status = #{pointsExchangeStatus},
+      recommand_status = #{recommandStatus},
+      verify_status = #{verifyStatus},
+      sort = #{sort},
+      sale = #{sale},
+      price = #{price},
+      promotion_price = #{promotionPrice},
+      gift_growth = #{giftGrowth},
+      gift_point = #{giftPoint},
+      use_point_limit = #{usePointLimit},
+      sub_title = #{subTitle},
+      original_price = #{originalPrice},
+      stock = #{stock},
+      low_stock = #{lowStock},
+      unit = #{unit},
+      weight = #{weight},
+      preview_status = #{previewStatus},
+      service_ids = #{serviceIds},
+      keywords = #{keywords},
+      note = #{note},
+      album_pics = #{albumPics},
+      detail_title = #{detailTitle},
+      promotion_start_time = #{promotionStartTime},
+      promotion_end_time = #{promotionEndTime},
+      promotion_per_limit = #{promotionPerLimit},
+      promotion_type = #{promotionType},
+      brand_name = #{brandName},
+      product_category_name = #{productCategoryName},
+      description = #{description},
+      detail_desc = #{detailDesc},
+      detail_html = #{detailHtml},
+      detail_mobile_html = #{detailMobileHtml},
+      intergration_price = #{intergrationPrice};
+
+  </insert>
 </mapper>
--- a/mall-dao/src/main/resources/com/buy507/mall/mapper/PmsSkuStockMapper.xml
+++ b/mall-dao/src/main/resources/com/buy507/mall/mapper/PmsSkuStockMapper.xml
@@ -341,4 +341,5 @@
                                                                                                               on ppa.id=ppav.product_attribute_id
    where pst.product_id=#{id,jdbcType=BIGINT}
  </select>
+
 </mapper>
--- a/mall-portal/src/main/java/com/buy507/mall/portal/controller/HomeController.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/controller/HomeController.java
@@ -95,24 +95,24 @@ public class HomeController {
 	@RequestMapping(value = "/getVipProductList", method = RequestMethod.GET)
 	@ResponseBody
 	public CommonResult<List<PmsProduct>> getVipProductList(){
-		List<PmsProduct> productList = homeService.getVipProductList();
-		return CommonResult.success(productList);
+		List<PmsProduct> vipProductList = homeService.getVipProductList();
+		return CommonResult.success(vipProductList);
 	}

 	@ApiOperation("获取积分专区商品")
 	@RequestMapping(value = "/getPointProductList", method = RequestMethod.GET)
 	@ResponseBody
 	public CommonResult<List<PmsProduct>> getPointProductList(){
-		List<PmsProduct> productList = homeService.getPointProductList();
-		return CommonResult.success(productList);
+		List<PmsProduct> pointProductList = homeService.getPointProductList();
+		return CommonResult.success(pointProductList);
 	}

 	@ApiOperation("获取积分兑换专区")
 	@RequestMapping(value = "/getPointExchangeProductList", method = RequestMethod.GET)
 	@ResponseBody
 	public CommonResult<List<PmsProduct>> getPointExchangeProductList(){
-		List<PmsProduct> productList = homeService.getPointExchangeProductList();
-		return CommonResult.success(productList);
+		List<PmsProduct> pointExchangeProductList = homeService.getPointExchangeProductList();
+		return CommonResult.success(pointExchangeProductList);
 	}


--- a/mall-portal/src/main/java/com/buy507/mall/portal/controller/UmsMemberController.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/controller/UmsMemberController.java
@@ -1,6 +1,7 @@
 package com.buy507.mall.portal.controller;

 import com.buy507.mall.common.api.CommonResult;
+import com.buy507.mall.model.UmsDevelopmentFund;
 import com.buy507.mall.portal.domain.*;
 import com.buy507.mall.portal.service.UmsMemberService;
 import io.swagger.annotations.Api;
@@ -89,7 +90,14 @@ public class UmsMemberController {
 		MemberInfoResult result = memberService.getMemberInfo();
        return CommonResult.success(result);
    }
-    
+
+    @ApiOperation("获取发展基金")
+    @RequestMapping(value = "/getDevelopmentFund", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<UmsDevelopmentFund> getDevelopmentFund() {
+        UmsDevelopmentFund result = memberService.getDevelopmentFund();
+        return CommonResult.success(result);
+    }
    
    @ApiOperation("修改会员昵称")
    @RequestMapping(value = "/updateMemberNickname", method = RequestMethod.POST)
--- a/mall-portal/src/main/java/com/buy507/mall/portal/controller/VipCenterController.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/controller/VipCenterController.java
@@ -1,143 +0,0 @@
-package com.buy507.mall.portal.controller;
-
-import com.buy507.mall.common.api.CommonResult;
-import com.buy507.mall.mapper.OmsOrderMapper;
-import com.buy507.mall.mapper.PmsProductMapper;
-import com.buy507.mall.mapper.UmsMemberMapper;
-import com.buy507.mall.model.OmsOrder;
-import com.buy507.mall.model.UmsMember;
-import com.buy507.mall.portal.service.OmsPortalOrderService;
-import com.buy507.mall.portal.service.UmsMemberService;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * ClassName:VipCenterController
- * Description:
- *
- * @Author axin
- * @Create 2025/2/19 11:09
- * @Version 1.0
- */
-
-@Controller
-@Api(tags = "VipCenterController", description = "会员中心")
-@RequestMapping("/vipCenter")
-public class VipCenterController {
-    @Autowired
-    private UmsMemberMapper memberMapper;
-
-    @Autowired
-    private UmsMemberService memberService;
-
-
-
-    @Autowired
-    private OmsOrderMapper orderMapper;
-
-    //店长升级金额
-    @Value("${storeManagerAmount}")
-    private BigDecimal storeManagerAmount;
-
-    //代理升级金额
-    @Value("${agentAmount}")
-    private BigDecimal agentAmount;
-
-    //市代理升级金额
-    @Value("${cityAgentAmount}")
-    private BigDecimal cityAgentAmount;
-
-    @ApiOperation("查询当前登录人信息")
-    @RequestMapping("/getCurrentUserInfo")
-    public CommonResult getCurrentUserInfo(){
-        //获取当前登录人的信息
-        UmsMember member = memberMapper.selectByPrimaryKey(memberService.getCurrentMember().getId());
-
-        // 获取当前用户的会员等级ID
-        Long memberLevelId = member.getMemberLevelId();
-
-        String memberLevelName = "普通用户";
-        if (memberLevelId == 1) {
-            memberLevelName = "普通用户";
-        } else if (memberLevelId == 2) {
-            memberLevelName = "VIP会员";
-        } else if (memberLevelId == 3) {
-            memberLevelName = "店长";
-        } else if (memberLevelId == 4) {
-            memberLevelName = "代理";
-        } else if (memberLevelId == 5) {
-            memberLevelName = "市代理";
-        }
-
-        // 返回当前用户的会员信息
-        return CommonResult.success("当前登录用户: " + member.getUsername() + ", 会员等级: " + memberLevelName);
-    }
-
-    @ApiOperation("创建会员中心订单")
-    @RequestMapping( value = "/createVipOrder", method = RequestMethod.POST)
-    public CommonResult createVipOrder(){
-        //获取当前登录人的信息
-        UmsMember member = memberMapper.selectByPrimaryKey(memberService.getCurrentMember().getId());
-
-        // 获取当前用户的会员等级ID
-        Long memberLevelId = member.getMemberLevelId();
-
-        //创建返回值
-        Map<String, Object> result = new HashMap<>();
-
-        //生成订单
-        OmsOrder order = new OmsOrder();
-        // 根据会员等级ID动态设置订单金额
-            // 店长
-        if (memberLevelId == 3) {
-            order.setTotalAmount(storeManagerAmount);
-            order.setPayAmount(storeManagerAmount);
-            // 代理
-        } else if (memberLevelId == 4) {
-            order.setTotalAmount(agentAmount);
-            order.setPayAmount(agentAmount);
-            // 市代理
-        } else if (memberLevelId == 5) {
-            order.setTotalAmount(cityAgentAmount);
-            order.setPayAmount(cityAgentAmount);
-        }
-        order.setMemberId(member.getId());
-        order.setCreateTime(new Date());
-        order.setModifyTime(new Date());
-
-        // 支付方式，0为未支付
-        order.setPayType(0);
-        // 订单状态，0为待付款
-        order.setStatus(0);
-        // 虚拟订单
-        order.setOrderType(3);
-        // 升级订单，无需实际收货人信息
-        order.setReceiverName("会员升级");
-
-        // 保存订单
-        orderMapper.insert(order);
-
-        // 更新返回结果
-        result.put("orderId", order.getId());
-
-        return CommonResult.success(result);
-
-    }
-
-
-
-
-}
--- a/mall-portal/src/main/java/com/buy507/mall/portal/controller/VipController.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/controller/VipController.java
@@ -0,0 +1,37 @@
+package com.buy507.mall.portal.controller;
+
+import com.buy507.mall.common.api.CommonResult;
+import com.buy507.mall.model.OmsOrder;
+import com.buy507.mall.portal.domain.OrderParam;
+import com.buy507.mall.portal.service.VipCenterService;
+import com.buy507.mall.portal.vo.OmsOrderDTO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+
+@RestController
+@RequestMapping("/vip")
+public class VipController {
+
+    @Autowired
+    private VipCenterService vipCenterService;
+
+    @ApiOperation("查询升级权限金额")
+    @RequestMapping(value = "/getUpgradeAmount", method = RequestMethod.GET)
+    public CommonResult<BigDecimal> getUpgradeAmount(@RequestParam Long memberLevelId){
+        BigDecimal amount = vipCenterService.getUpgradeAmount(memberLevelId);
+        return CommonResult.success(amount);
+    }
+
+    @ApiOperation("创建购买权益订单")
+    @RequestMapping(value = "/createUpgradeOrder", method = RequestMethod.POST)
+    public CommonResult createUpgradeOrder(@RequestBody OmsOrderDTO param){
+        try {
+            return vipCenterService.createUpgradeOrder(param);
+        } catch (Exception e) {
+            return CommonResult.failed("createOrder fail");
+        }
+    }
+}
--- a/mall-portal/src/main/java/com/buy507/mall/portal/dao/MyWalletMapper.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/dao/MyWalletMapper.java
@@ -25,7 +25,7 @@ public interface MyWalletMapper {
     * @return
     */
    @Select("SELECT revenue_amount, remarks, transfer_payment_time FROM ums_member_account_transaction " +
-            "WHERE ums_member_account_transaction.member_id = #{userId}  ORDER BY transfer_payment_time DESC")
+            "WHERE member_id = #{userId} And flow_type = 1  ORDER BY transfer_payment_time DESC")
    List<TransactionCashVo> getCashFlow(Long userId);

    /**
@@ -42,6 +42,6 @@ public interface MyWalletMapper {
     * @return
     */
    @Select("SELECT revenue_points, remarks, transfer_payment_time FROM ums_member_account_transaction " +
-            "WHERE ums_member_account_transaction.member_id = #{userId}  ORDER BY transfer_payment_time DESC")
+            "WHERE member_id = #{userId} And flow_type = 2  ORDER BY transfer_payment_time DESC")
    List<TransactionPointsVo> getPointsFlow(Long userId);
 }
--- a/mall-portal/src/main/java/com/buy507/mall/portal/domain/OrderItemResult.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/domain/OrderItemResult.java
@@ -38,7 +38,29 @@ public class OrderItemResult {
 	
 	@ApiModelProperty(value = "商品SKU属性3")
 	private String sp3;
-	
+
+	@ApiModelProperty("积分价格")
+	private Integer intergrationPrice;
+
+	@ApiModelProperty("积分兑换专区")
+	private Integer intergrationExchange;
+
+	public Integer getIntergrationPrice() {
+		return intergrationPrice;
+	}
+
+	public void setIntergrationPrice(Integer intergrationPrice) {
+		this.intergrationPrice = intergrationPrice;
+	}
+
+	public Integer getIntergrationExchange() {
+		return intergrationExchange;
+	}
+
+	public void setIntergrationExchange(Integer intergrationExchange) {
+		this.intergrationExchange = intergrationExchange;
+	}
+
 	public Long getOrderId() {
 		return orderId;
 	}
--- a/mall-portal/src/main/java/com/buy507/mall/portal/domain/OrderResult.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/domain/OrderResult.java
@@ -113,6 +113,27 @@ public class OrderResult {
 	@ApiModelProperty(value = "快速排队订单还剩邀请成功的人数")
 	private Integer invitedCount;

+	@ApiModelProperty(value = "积分价格")
+	 private Integer intergrationPrice;
+
+	@ApiModelProperty(value = "积分兑换专区")
+	private Integer intergrationExchange;
+
+	public Integer getIntergrationExchange() {
+		return intergrationExchange;
+	}
+
+	public void setIntergrationExchange(Integer intergrationExchange) {
+		this.intergrationExchange = intergrationExchange;
+	}
+
+	public Integer getIntergrationPrice() {
+		return intergrationPrice;
+	}
+
+	public void setIntergrationPrice(Integer intergrationPrice) {
+		this.intergrationPrice = intergrationPrice;
+	}

 	public Long getOrderId() {
 		return orderId;
--- a/mall-portal/src/main/java/com/buy507/mall/portal/domain/ProductDetailResult.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/domain/ProductDetailResult.java
@@ -13,6 +13,7 @@ import com.buy507.mall.model.SmsCoupon;
 import com.buy507.mall.model.SmsCouponProductRelation;

 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.data.annotation.Transient;

 public class ProductDetailResult {
    private Long id;
@@ -152,7 +153,53 @@ public class ProductDetailResult {
    private int countComent;
    
    private int applauseRate;
-    
+
+    @Transient
+    @ApiModelProperty(value = "积分专区状态")
+    private Integer pointsAreaStatus;
+
+    @Transient
+    @ApiModelProperty(value = "积分兑换专区状态")
+    private Integer pointsExchangeStatus;
+
+    @ApiModelProperty(value = "会员中心：1->店长; 2->代理; 3->市代理")
+    private Integer vipCenter;
+
+    @ApiModelProperty(value = "商品积分价格")
+    private Integer intergrationPrice;
+
+    public Integer getPointsAreaStatus() {
+        return pointsAreaStatus;
+    }
+
+    public void setPointsAreaStatus(Integer pointsAreaStatus) {
+        this.pointsAreaStatus = pointsAreaStatus;
+    }
+
+    public Integer getPointsExchangeStatus() {
+        return pointsExchangeStatus;
+    }
+
+    public void setPointsExchangeStatus(Integer pointsExchangeStatus) {
+        this.pointsExchangeStatus = pointsExchangeStatus;
+    }
+
+    public Integer getVipCenter() {
+        return vipCenter;
+    }
+
+    public void setVipCenter(Integer vipCenter) {
+        this.vipCenter = vipCenter;
+    }
+
+    public Integer getIntergrationPrice() {
+        return intergrationPrice;
+    }
+
+    public void setIntergrationPrice(Integer intergrationPrice) {
+        this.intergrationPrice = intergrationPrice;
+    }
+
    List<ProductAttributeResult> specList;
    
    List<ProductAttributeResult> specChildList;
--- a/mall-portal/src/main/java/com/buy507/mall/portal/domain/ProductSkuResult.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/domain/ProductSkuResult.java
@@ -14,6 +14,16 @@ public class ProductSkuResult {
 	
 	private String pic;

+	private Integer intergrationPrice;
+
+	public Integer getIntergrationPrice() {
+		return intergrationPrice;
+	}
+
+	public void setIntergrationPrice(Integer intergrationPrice) {
+		this.intergrationPrice = intergrationPrice;
+	}
+
 	public Long getId() {
 		return id;
 	}
--- a/mall-portal/src/main/java/com/buy507/mall/portal/service/UmsMemberService.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/UmsMemberService.java
@@ -3,6 +3,7 @@ package com.buy507.mall.portal.service;
 import java.util.List;
 import java.util.Map;

+import com.buy507.mall.model.UmsDevelopmentFund;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestParam;

@@ -185,4 +186,10 @@ public interface UmsMemberService {
     * @return
     */
    CommonResult<Map<String, Object>> personalTeam();
+
+    /**
+     * 查询发展基金
+     * @return
+     */
+    UmsDevelopmentFund getDevelopmentFund();
 }
--- a/mall-portal/src/main/java/com/buy507/mall/portal/service/VipCenterService.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/VipCenterService.java
@@ -0,0 +1,25 @@
+package com.buy507.mall.portal.service;
+
+import com.buy507.mall.common.api.CommonResult;
+import com.buy507.mall.model.OmsOrder;
+import com.buy507.mall.portal.domain.OrderParam;
+import com.buy507.mall.portal.vo.OmsOrderDTO;
+
+import java.math.BigDecimal;
+
+public interface VipCenterService {
+
+    /**
+     * 查询升级权限金额
+     * @param memberLevelId
+     * @return
+     */
+    BigDecimal getUpgradeAmount(Long memberLevelId);
+
+    /**
+     * 创建购买权益订单
+     * @param param
+     * @return
+     */
+    CommonResult createUpgradeOrder(OmsOrderDTO param);
+}
--- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/HomeServiceImpl.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/HomeServiceImpl.java
@@ -1,66 +1,26 @@
 package com.buy507.mall.portal.service.impl;

-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import com.buy507.mall.mapper.CmsSubjectMapper;
-import com.buy507.mall.mapper.PmsCommentMapper;
-import com.buy507.mall.mapper.PmsCommentReplayMapper;
-import com.buy507.mall.mapper.PmsProductAttributeMapper;
-import com.buy507.mall.mapper.PmsProductAttributeValueMapper;
-import com.buy507.mall.mapper.PmsProductCategoryMapper;
-import com.buy507.mall.mapper.PmsProductFullReductionMapper;
-import com.buy507.mall.mapper.PmsProductMapper;
-import com.buy507.mall.mapper.PmsSkuStockMapper;
-import com.buy507.mall.mapper.SmsFlashPromotionMapper;
-import com.buy507.mall.mapper.SmsFlashPromotionSessionMapper;
-import com.buy507.mall.mapper.SmsHomeAdvertiseMapper;
-import com.buy507.mall.model.CmsSubject;
-import com.buy507.mall.model.CmsSubjectExample;
-import com.buy507.mall.model.PmsComment;
-import com.buy507.mall.model.PmsCommentReplay;
-import com.buy507.mall.model.PmsProduct;
-import com.buy507.mall.model.PmsProductAttribute;
-import com.buy507.mall.model.PmsProductAttributeExample;
-import com.buy507.mall.model.PmsProductAttributeValue;
-import com.buy507.mall.model.PmsProductAttributeValueExample;
-import com.buy507.mall.model.PmsProductCategory;
-import com.buy507.mall.model.PmsProductCategoryExample;
-import com.buy507.mall.model.PmsProductExample;
-import com.buy507.mall.model.PmsProductFullReduction;
-import com.buy507.mall.model.PmsSkuStock;
-import com.buy507.mall.model.PmsSkuStockExample;
-import com.buy507.mall.model.SmsFlashPromotion;
-import com.buy507.mall.model.SmsFlashPromotionExample;
-import com.buy507.mall.model.SmsFlashPromotionSession;
-import com.buy507.mall.model.SmsFlashPromotionSessionExample;
-import com.buy507.mall.model.SmsHomeAdvertise;
-import com.buy507.mall.model.SmsHomeAdvertiseExample;
-import com.buy507.mall.model.UmsMember;
+import com.buy507.mall.mapper.*;
+import com.buy507.mall.model.*;
 import com.buy507.mall.portal.dao.HomeDao;
-import com.buy507.mall.portal.domain.FlashPromotionProduct;
-import com.buy507.mall.portal.domain.HomeContentResult;
-import com.buy507.mall.portal.domain.HomeFlashPromotion;
-import com.buy507.mall.portal.domain.MemberProductCollection;
-import com.buy507.mall.portal.domain.ProductAttributeResult;
-import com.buy507.mall.portal.domain.ProductCategoryOptions;
-import com.buy507.mall.portal.domain.ProductDetailResult;
-import com.buy507.mall.portal.domain.ProductSkuResult;
+import com.buy507.mall.portal.domain.*;
 import com.buy507.mall.portal.repository.MemberProductCollectionRepository;
 import com.buy507.mall.portal.service.HomeService;
 import com.buy507.mall.portal.service.PortalCommonService;
 import com.buy507.mall.portal.service.UmsMemberService;
 import com.buy507.mall.portal.util.DateUtil;
 import com.github.pagehelper.PageHelper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;

 /**
 * 首页内容管理Service实现类
@@ -134,9 +94,9 @@ public class HomeServiceImpl implements HomeService {
 				for (PmsProduct product : PointAreaProductList) {
 					product.setPrice(product.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
 				}
-				for (PmsProduct product : pointsExchangeProductList) {
-					product.setPrice(product.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
-				}
+//				for (PmsProduct product : pointsExchangeProductList) {
+//					product.setPrice(product.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
+//				}
 				for (PmsProduct product : allProductList) {
 					product.setPrice(product.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
 				}
@@ -430,11 +390,16 @@ public class HomeServiceImpl implements HomeService {
 		}
 		List<PmsSkuStock> list = skuStockMapper.selectByExample(example);
 		ProductSkuResult skuResult = new ProductSkuResult();
+
+		PmsProduct product = productMapper.selectByPrimaryKey(productId);
+
+		if(product.getPointsExchangeStatus() == 1){
+			skuResult.setIntergrationPrice(product.getIntergrationPrice());
+		}
 		for (PmsSkuStock stock : list) {
 			BeanUtils.copyProperties(stock, skuResult);
 		}
-
-		//根据会员等级显示不同的商品价格
+        //根据会员等级显示不同的商品价格
 		UmsMember member = memberService.getCurrentMember();
 		if (member != null) {
 			BigDecimal discount = commonService.getDiscount(member.getId());
--- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/MemberPointsSplitProfitService.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/MemberPointsSplitProfitService.java
@@ -162,6 +162,7 @@ public class MemberPointsSplitProfitService{
        accountTransaction.setTransactionState(UmsMemberAccountTransaction.TRANSACTION_STATE_YES);
        accountTransaction.setRevenuePoints(revenuePoints);
        accountTransaction.setTransferPaymentTime(DateUtil.date());
+        accountTransaction.setFlowType(2);
        umsMemberAccountTransactionMapper.insert(accountTransaction);
        log.info("new Account Transaction {}" , JSONUtil.toJsonStr(accountTransaction));

@@ -206,6 +207,7 @@ public class MemberPointsSplitProfitService{
                accountTransaction.setRevenuePoints(pointsCommission);
                //即时到账
                accountTransaction.setTransferPaymentTime(DateUtil.date());
+                accountTransaction.setFlowType(2);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //会员金额到账
@@ -235,6 +237,7 @@ public class MemberPointsSplitProfitService{
                accountTransaction.setRevenuePoints(pointsCommission);
                //即时到账
                accountTransaction.setTransferPaymentTime(DateUtil.date());
+                accountTransaction.setFlowType(2);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //会员金额到账
@@ -281,6 +284,7 @@ public class MemberPointsSplitProfitService{
                accountTransaction.setRemarks("三级代理上级积分分润");
                accountTransaction.setRevenuePoints(pointsCommission);
                accountTransaction.setTransferPaymentTime(DateUtil.date());
+                accountTransaction.setFlowType(2);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //会员金额到账
@@ -308,6 +312,7 @@ public class MemberPointsSplitProfitService{
                accountTransaction.setRevenuePoints(pointsCommission);
                //24小时后到账
                accountTransaction.setTransferPaymentTime(DateUtil.tomorrow());
+                accountTransaction.setFlowType(2);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //会员金额到账
@@ -351,6 +356,7 @@ public class MemberPointsSplitProfitService{
                accountTransaction.setRevenuePoints(pointsCommission);
                //24小时后到账
                accountTransaction.setTransferPaymentTime(DateUtil.date());
+                accountTransaction.setFlowType(2);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //会员金额到账
@@ -371,6 +377,7 @@ public class MemberPointsSplitProfitService{
                accountTransaction.setMemberId(higherMember.getId());
                accountTransaction.setOrderId(order.getId());
                accountTransaction.setRemarks("四级市代理平级积分分润");
+                accountTransaction.setFlowType(2);
                accountTransaction.setRevenuePoints(pointsCommission);

                //会员金额到账
--- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/MemberSplitProfitService.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/MemberSplitProfitService.java
@@ -175,6 +175,7 @@ public class MemberSplitProfitService{
                accountTransaction.setRemarks("会员此订单退出队列到账");
                accountTransaction.setRevenueAmount(orderQueue.getOrderAmount());
                accountTransaction.setTransferPaymentTime(DateUtil.date());
+                accountTransaction.setFlowType(1);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //出局后订单状态置为2
@@ -295,6 +296,7 @@ public class MemberSplitProfitService{
                            accountTransaction.setRevenueAmount(higherQueue.getOrderAmount());
                            //即时到账
                            accountTransaction.setTransferPaymentTime(DateUtil.date());
+                            accountTransaction.setFlowType(1);
                            umsMemberAccountTransactionMapper.insert(accountTransaction);

                            //快速出局后将订单状态置为2
@@ -402,6 +404,7 @@ public class MemberSplitProfitService{
        accountTransaction.setRevenueAmount(revenueAmount);
        //
        accountTransaction.setTransferPaymentTime(DateUtil.date());
+        accountTransaction.setFlowType(1);
        umsMemberAccountTransactionMapper.insert(accountTransaction);
        log.info("new Account Transaction {}" , JSONUtil.toJsonStr(accountTransaction));

@@ -445,6 +448,7 @@ public class MemberSplitProfitService{
                accountTransaction.setRevenueAmount(payAmountPercent);
                //即时到账
                accountTransaction.setTransferPaymentTime(DateUtil.date());
+                accountTransaction.setFlowType(1);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //会员金额到账
@@ -474,6 +478,7 @@ public class MemberSplitProfitService{
                accountTransaction.setRevenueAmount(tenPercent);
                //即时到账
                accountTransaction.setTransferPaymentTime(DateUtil.date());
+                accountTransaction.setFlowType(1);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //会员金额到账
@@ -520,6 +525,7 @@ public class MemberSplitProfitService{
                accountTransaction.setRemarks("三级代理上级分润");
                accountTransaction.setRevenueAmount(payAmountPercent);
                accountTransaction.setTransferPaymentTime(DateUtil.date());
+                accountTransaction.setFlowType(1);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //会员金额到账
@@ -547,6 +553,7 @@ public class MemberSplitProfitService{
                accountTransaction.setRevenueAmount(tenPercent);
                //24小时后到账
                accountTransaction.setTransferPaymentTime(DateUtil.tomorrow());
+                accountTransaction.setFlowType(1);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //会员金额到账
@@ -591,6 +598,7 @@ public class MemberSplitProfitService{
                accountTransaction.setRevenueAmount(payAmountPercent);
                //24小时后到账
                accountTransaction.setTransferPaymentTime(DateUtil.date());
+                accountTransaction.setFlowType(1);
                umsMemberAccountTransactionMapper.insert(accountTransaction);

                //会员金额到账
@@ -620,6 +628,7 @@ public class MemberSplitProfitService{

                //24小时后到账
                accountTransaction.setTransferPaymentTime(DateUtil.tomorrow());
+                accountTransaction.setFlowType(1);
                umsMemberAccountTransactionMapper.insert(accountTransaction);
            }
        }
--- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
@@ -241,6 +241,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
            orderResult.setPayAmount(order.getPayAmount());
            orderResult.setOrderStatus(order.getStatus());
            orderResult.setDeliveryType(order.getDeliveryType());
+
+
            if (order.getStatus() == 0) {
                orderResult.setOrderStatusName("待付款");
                if (order.getPayType() != null && order.getPayType() == 3) {
@@ -294,10 +296,17 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
            orderItemExample.createCriteria().andOrderIdEqualTo(order.getId());
            orderItemList = orderItemMapper.selectByExample(orderItemExample);
            orderResult.setProductsNum(orderItemList.size());
-
+            PmsProduct product = productMapper.getProductByOrderSn(order.getOrderSn());
+            OmsOrderItem orderItem1 = orderItemMapper.selectByOrderId(order.getId());
+            orderResult.setProductsNum(orderItem1.getProductQuantity());
+            orderResult.setIntergrationPrice(product.getIntergrationPrice());
+            orderResult.setIntergrationExchange(product.getPointsExchangeStatus());
            orderItemResultList = new ArrayList<>();
            for (OmsOrderItem orderItem : orderItemList) {
                orderItemResult = new OrderItemResult();
+                orderItemResult.setProductQuantity(orderItem.getProductQuantity());
+                orderItemResult.setIntergrationPrice(product.getIntergrationPrice());
+                orderItemResult.setIntergrationExchange(product.getPointsExchangeStatus());
                orderItemResult.setOrderId(order.getId());
                orderItemResult.setOrderSn(order.getOrderSn());
                orderItemResult.setProductBrand(orderItem.getProductBrand());
@@ -371,14 +380,19 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 			orderResult.setPaymentTime(order.getPaymentTime());

 			// 获取商品信息，判断是否是积分专区商品
-			PmsProduct product = productMapper.getProductByOrderSn((order.getOrderSn()));
+			PmsProduct product = productMapper.getProductByOrderSn(order.getOrderSn());
+            System.out.println("hello");
 			boolean isPointsExchangeStatus = product != null && product.getPointsExchangeStatus() == 1;

 			//支付类型: 0->未支付；1->支付宝；2->微信; 3->线下支付; 4->积分支付
 			//判断是否为积分专区商品
 			if(isPointsExchangeStatus) {
-				orderResult.setPayType(4); // 设置为积分支付
-				orderResult.setPayTypeName("积分支付");
+                orderResult.setIntergrationPrice(product.getIntergrationPrice());
+                orderResult.setIntergrationExchange(product.getPointsExchangeStatus());
+                orderResult.setPayType(order.getPayType());
+                if (order.getPayType() == 0) {
+                    orderResult.setPayTypeName("未支付");
+                }
 				}else {
 				// 如果不是积分兑换专区商品，则继续使用其他支付方式
 				if (order.getPayType() != null) {
@@ -415,6 +429,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 			orderResult.setDeliveryTime(order.getDeliveryTime());
 			orderResult.setReceiveTime(order.getReceiveTime());
 			orderResult.setCommentTime(order.getCommentTime());
+            orderResult.setOrderStatus(0);

 			//0->不开发票；1->电子发票；2->纸质发票
 			if(order.getBillType() != null) {
@@ -457,6 +472,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 				orderItemResult.setProductPic(orderItem.getProductPic());
 				orderItemResult.setProductPrice(orderItem.getProductPrice());
 				orderItemResult.setProductQuantity(orderItem.getProductQuantity());
+                orderItemResult.setIntergrationPrice(product.getIntergrationPrice());
+                orderItemResult.setIntergrationExchange(product.getPointsExchangeStatus());
 				orderItemResult.setSp1(orderItem.getSp1());
 				orderItemResult.setSp2(orderItem.getSp2());
 				orderItemResult.setSp3(orderItem.getSp3());
@@ -704,6 +721,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
        for (OmsOrderItem orderItem : orderItemList) {
            orderItem.setOrderId(order.getId());
            orderItem.setOrderSn(order.getOrderSn());
+
            orderItemMapper.insert(orderItem);
        }

@@ -760,7 +778,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 			return CommonResult.validateFailed("未查询到商品信息");
 		}

-        PmsProduct product = productMapper.selectByPrimaryKey(skuStock.getProductId());
+        PmsProduct product = productMapper.getPrimaryKey(skuStock.getProductId());


        // 判断商品是否属于积分兑换区
@@ -771,7 +789,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
        if (isPointsExchangeStatus) {
            // 积分兑换专区商品，设置积分价格
            //获取商品的积分价格
-            BigDecimal pointsPrice = new BigDecimal(product.getintergrationPrice());
+            BigDecimal pointsPrice = new BigDecimal(product.getIntergrationPrice());
            // 积分兑换商品的总金额
            totalPointsAmount = pointsPrice.multiply(new BigDecimal(orderParam.getQuantity()));
        }
@@ -1329,6 +1347,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
    public CommonResult pointPayment(Long orderId) {

        OmsOrder order = orderMapper.selectByPrimaryKey(orderId);
+        PmsProduct product1 = productMapper.getProductByOrderSn(order.getOrderSn());
+        OmsOrderItem orderItem1 = orderItemMapper.selectByOrderId(orderId);
        if (order == null) {
            return CommonResult.validateFailed("未查询到订单信息");
        }
@@ -1340,14 +1360,11 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
        // 判断是否使用积分支付
        UmsMember member = memberMapper.selectByPrimaryKey(currentMember.getId());

-        BigDecimal zero = new BigDecimal(0);
-        // 只要订单的支付金额为0，即表示使用积分支付
-        int flag = order.getPayAmount().compareTo(zero);
-        if (flag == 0) { // 如果实际支付金额为0，表示使用积分支付
+        if(product1.getPointsExchangeStatus() == 1) {

            // 获取积分兑换价格
            // 使用订单中的积分字段
-            BigDecimal totalPointsAmount = order.getIntegrationAmount();
+            BigDecimal totalPointsAmount = BigDecimal.valueOf((long) product1.getIntergrationPrice() * orderItem1.getProductQuantity());
            // 获取当前用户积分
            BigDecimal memberPoints = BigDecimal.valueOf(member.getIntegration());

@@ -1355,133 +1372,159 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
            if (memberPoints.compareTo(totalPointsAmount) < 0) {
                return CommonResult.validateFailed("积分不足，无法完成兑换");
            }
+//        BigDecimal zero = new BigDecimal(0);
+//        // 只要订单的支付金额为0，即表示使用积分支付
+//        int flag = order.getPayAmount().compareTo(zero);
+//        if (flag == 0) { // 如果实际支付金额为0，表示使用积分支付
+//
+//
+//            }

            // 扣除用户积分，并记录积分变动
            // 扣除积分
            member.setIntegration(memberPoints.subtract(totalPointsAmount).intValue());
            // 冻结积分
-            member.setFreeze(member.getFreeze().add(totalPointsAmount));
+            //  member.setFreeze(member.getFreeze().add(totalPointsAmount));
            memberMapper.updateByPrimaryKey(member);

+
+            // 更新订单状态为已支付
+            // 设置为余额支付
+            order.setPayType(4);
+            // 设置订单状态为已支付
+            order.setStatus(2);
+            order.setPaymentTime(new Date());
+            orderMapper.updateByPrimaryKey(order);
+
+            // 处理库存、分销等后续操作
+            executorService.execute(() -> {
+                // 处理库存
+                updateStock(orderId);
+            });
+
+            // 返还积分金额到前端
+            return CommonResult.success(totalPointsAmount, "支付成功");
+
            // 支付方式：0->未支付；1->支付宝；2->微信；3->线下支付；4->积分支付支付
            // 支付方式为0才允许支付
-            if (order.getPayType() != 0) {
-                return CommonResult.validateFailed("订单已支付");
-            }
+//            if (order.getPayType() != 0) {
+//                return CommonResult.validateFailed("订单已支付");
+//            }


-            if (flag == 0) {
-                //写入会员交易记录表
-                DmsMemberTradeRecord tradeRecord = new DmsMemberTradeRecord();
-                tradeRecord.setMemberId(member.getId());
-                //积分购物
-                tradeRecord.setItemType(ItemType.IntegralShopping);
-                tradeRecord.setNote("积分抵扣");
-                tradeRecord.setTitle("积分抵扣");
-                tradeRecord.setValue(totalPointsAmount);
-                //收支类型：0->收入；1->支出
-                tradeRecord.setType(1);
-                tradeRecord.setCreateTime(new Date());
-                memberTradeRecordMapper.insert(tradeRecord);
+//            if (product1.getPointsExchangeStatus() == 1) {
+//                //写入会员交易记录表
+//                DmsMemberTradeRecord tradeRecord = new DmsMemberTradeRecord();
+//                tradeRecord.setMemberId(member.getId());
+//                //积分购物
+//                tradeRecord.setItemType(ItemType.IntegralShopping);
+//                tradeRecord.setNote("积分抵扣");
+//                tradeRecord.setTitle("积分抵扣");
+//                tradeRecord.setValue(totalPointsAmount);
+//                //收支类型：0->收入；1->支出
+//                tradeRecord.setType(1);
+//                tradeRecord.setCreateTime(new Date());
+//                memberTradeRecordMapper.insert(tradeRecord);
+//
+//                while (true) {
+//                    long time = System.currentTimeMillis() + RedisLock.TIMEOUT;
+//                    if (redisLock.lock(String.valueOf(member.getId()), String.valueOf(time))) {
+//                        member = memberMapper.selectByPrimaryKey(member.getId());
+//                        //修改冻结金额,增加冻结资金
+//                        member.setFreeze(member.getFreeze().add(order.getIntegrationAmount()));
+//                        memberMapper.updateByPrimaryKey(member);
+//                        redisLock.unlock(String.valueOf(member.getId()), String.valueOf(time));
+//                        break;
+//                    }
+//                }
+//
+//            } else {
+//                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->余额支付
+//            order.setPayType(4);
+//
+//            //提货方式：0->自提；1->物流
+//            if (order.getDeliveryType() == 0) {
+//                //订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
+//                order.setStatus(2);
+//            } else {
+//                //订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
+//                order.setStatus(1);
+//            }
+//
+//            order.setModifyTime(date);
+//            order.setPaymentTime(date);
+//            orderMapper.updateByPrimaryKey(order);

-                while (true) {
-                    long time = System.currentTimeMillis() + RedisLock.TIMEOUT;
-                    if (redisLock.lock(String.valueOf(member.getId()), String.valueOf(time))) {
-                        member = memberMapper.selectByPrimaryKey(member.getId());
-                        //修改冻结金额,增加冻结资金
-                        member.setFreeze(member.getFreeze().add(order.getIntegrationAmount()));
-                        memberMapper.updateByPrimaryKey(member);
-                        redisLock.unlock(String.valueOf(member.getId()), String.valueOf(time));
-                        break;
-                    }
-                }
+//            //修改商品库存信息需要加锁，影响前台响应，所以用线程来处理
+//            executorService.execute(new Runnable() {
+//
+//                @Override
+//                public void run() {
+//                    //库存变动
+//                    //查询订单商品项
+//                    OmsOrderItemExample example = new OmsOrderItemExample();
+//                    example.createCriteria().andOrderIdEqualTo(order.getId());
+//                    List<OmsOrderItem> orderItemList = orderItemMapper.selectByExample(example);
+//                    PmsSkuStock skuStock = null;
+//                    PmsProduct product = null;
+//                    for (OmsOrderItem orderItem : orderItemList) {
+//                        while (true) {
+//                            long time = System.currentTimeMillis() + RedisLock.TIMEOUT;
+//                            if (redisLock.lock(orderItem.getProductId().toString(), String.valueOf(time))) {
+//                                skuStock = skuStockMapper.selectByPrimaryKey(orderItem.getProductSkuId());
+//                                if (skuStock != null) {
+//                                    skuStock.setLockStock(skuStock.getLockStock() - orderItem.getProductQuantity());
+//                                    skuStock.setStock(skuStock.getStock() - orderItem.getProductQuantity());
+//                                    skuStock.setSale((skuStock.getSale() == null ? 0 : skuStock.getSale()) + orderItem.getProductQuantity());
+//                                    skuStockMapper.updateByPrimaryKey(skuStock);
+//                                }
+//
+//                                product = productMapper.selectByPrimaryKey(orderItem.getProductId());
+//                                if (product != null) {
+//                                    product.setStock(product.getStock() - orderItem.getProductQuantity());
+//                                    product.setSale((product.getSale() == null ? 0 : product.getSale()) + orderItem.getProductQuantity());
+//                                    productMapper.updateByPrimaryKey(product);
+//                                }
+//                                redisLock.unlock(orderItem.getProductId().toString(), String.valueOf(time));
+//                                break;
+//                            }
+//                        }
+//                    }
+//                }
+//            });

-            } else {
-                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->余额支付
-            order.setPayType(4);
-
-            //提货方式：0->自提；1->物流
-            if (order.getDeliveryType() == 0) {
-                //订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
-                order.setStatus(2);
-            } else {
-                //订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
-                order.setStatus(1);
-            }
-
-            order.setModifyTime(date);
-            order.setPaymentTime(date);
-            orderMapper.updateByPrimaryKey(order);
-
-            //修改商品库存信息需要加锁，影响前台响应，所以用线程来处理
-            executorService.execute(new Runnable() {
-
-                @Override
-                public void run() {
-                    //库存变动
-                    //查询订单商品项
-                    OmsOrderItemExample example = new OmsOrderItemExample();
-                    example.createCriteria().andOrderIdEqualTo(order.getId());
-                    List<OmsOrderItem> orderItemList = orderItemMapper.selectByExample(example);
-                    PmsSkuStock skuStock = null;
-                    PmsProduct product = null;
-                    for (OmsOrderItem orderItem : orderItemList) {
-                        while (true) {
-                            long time = System.currentTimeMillis() + RedisLock.TIMEOUT;
-                            if (redisLock.lock(orderItem.getProductId().toString(), String.valueOf(time))) {
-                                skuStock = skuStockMapper.selectByPrimaryKey(orderItem.getProductSkuId());
-                                if (skuStock != null) {
-                                    skuStock.setLockStock(skuStock.getLockStock() - orderItem.getProductQuantity());
-                                    skuStock.setStock(skuStock.getStock() - orderItem.getProductQuantity());
-                                    skuStock.setSale((skuStock.getSale() == null ? 0 : skuStock.getSale()) + orderItem.getProductQuantity());
-                                    skuStockMapper.updateByPrimaryKey(skuStock);
-                                }
-
-                                product = productMapper.selectByPrimaryKey(orderItem.getProductId());
-                                if (product != null) {
-                                    product.setStock(product.getStock() - orderItem.getProductQuantity());
-                                    product.setSale((product.getSale() == null ? 0 : product.getSale()) + orderItem.getProductQuantity());
-                                    productMapper.updateByPrimaryKey(product);
-                                }
-                                redisLock.unlock(orderItem.getProductId().toString(), String.valueOf(time));
-                                break;
-                            }
-                        }
-                    }
-                }
-            });
-
-            boolean distributionFlag = true;
-            OmsOrderItemExample example = new OmsOrderItemExample();
-            example.createCriteria().andOrderIdEqualTo(order.getId());
-            List<OmsOrderItem> orderItemList = orderItemMapper.selectByExample(example);
-            PmsProduct product = null;
-            for (OmsOrderItem orderItem : orderItemList) {
-                product = productMapper.selectByPrimaryKey(orderItem.getProductId());
-                if (product.getDistributionFlag().equals(0)) { //分销标志（0->不参与；1->参与）
-                    distributionFlag = false;
-                }
-            }
-
-            //分销处理
-            if (distributionFlag) {
-                distributeSender.sendMessage(order.getId());
-            }
+//            boolean distributionFlag = true;
+//            OmsOrderItemExample example = new OmsOrderItemExample();
+//            example.createCriteria().andOrderIdEqualTo(order.getId());
+//            List<OmsOrderItem> orderItemList = orderItemMapper.selectByExample(example);
+//            PmsProduct product = null;
+//            for (OmsOrderItem orderItem : orderItemList) {
+//                product = productMapper.selectByPrimaryKey(orderItem.getProductId());
+//                if (product.getDistributionFlag().equals(0)) { //分销标志（0->不参与；1->参与）
+//                    distributionFlag = false;
+//                }
+//            }
+//
+//            //分销处理
+//            if (distributionFlag) {
+//                distributeSender.sendMessage(order.getId());
+//            }
+//        }
        }
        return CommonResult.success(null, "支付成功");
    }
@@ -1531,6 +1574,29 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
        accountTransaction.setRemarks( "商品名称" + pmsProduct.getName());
        umsMemberAccountTransactionMapper.insert(accountTransaction);

+        //如果是积分专区的商品则进行积分专区相对应的逻辑
+        if (pmsProduct.getPointsAreaStatus() == 1) {
+            //奖励积分是购买的价格的100%
+            int rewardPoints = payAmount.intValue();
+            // 增加用户积分
+            if (member != null) {
+
+                if (member.getIntegration() == null) {
+                    member.setIntegration(rewardPoints);
+                } else {
+                    member.setIntegration(member.getIntegration() + rewardPoints);
+                }
+
+                // 更新用户积分
+                memberMapper.updateByPrimaryKey(member);
+                //增加基金积分
+                int fundPoints = (int)(rewardPoints * 0.05);
+                umsDevelopmentFundMapper.updatePoints(fundPoints);
+
+//                //积分分润逻辑
+//                memberPointsSplitProfitService.pointsSplit(order);
+            }
+        }
        // 更新订单状态为已支付
        OmsOrder order = orderMapper.selectByPrimaryKey(orderId);
        // 设置为余额支付
--- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java
@@ -566,7 +566,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());
+		result.setMemberLevel(member.getMemberLevel().getValue()-1);
 		result.setMemberId(loginMember.getId());
 		result.setRealName(member.getRealName());
 		result.setDetailAddress(member.getDetailAddress());
@@ -622,10 +622,6 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 			result.setInviter(memberMapper.selectByPrimaryKey(teamLevel.getParentId()).getNickname());
 		}

-        /*查询发展基金*/
-        BigDecimal totalCash  = umsDevelopmentFundMapper.getTotalCash();
-        Integer totalPoints = umsDevelopmentFundMapper.getTotalPoints();
-
 		return result;
 	}
    
@@ -1312,6 +1308,17 @@ public class UmsMemberServiceImpl implements UmsMemberService {
        return CommonResult.success(result);
    }

+    /**
+     * 查询发展基金
+     * @return
+     */
+    @Override
+    public UmsDevelopmentFund getDevelopmentFund() {
+        UmsDevelopmentFund developmentFund = new UmsDevelopmentFund();
+        developmentFund = umsDevelopmentFundMapper.selectAll();
+        return developmentFund;
+    }
+
    private Map<String, Object> getOrderInfoByDate(DateTime begin, DateTime end, UmsMember currentMember, List<Long> teamIdList) {

        Map<String, Object> infoMap = new HashMap<>();
--- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/VipCenterServiceImpl.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/VipCenterServiceImpl.java
@@ -0,0 +1,109 @@
+package com.buy507.mall.portal.service.impl;
+
+import cn.hutool.db.sql.Order;
+import com.buy507.mall.common.api.CommonResult;
+import com.buy507.mall.mapper.OmsOrderMapper;
+import com.buy507.mall.model.MemberLevel;
+import com.buy507.mall.model.OmsOrder;
+import com.buy507.mall.portal.domain.OrderParam;
+import com.buy507.mall.portal.domain.OrderResult;
+import com.buy507.mall.portal.service.RedisService;
+import com.buy507.mall.portal.service.VipCenterService;
+import com.buy507.mall.portal.vo.OmsOrderDTO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class VipCenterServiceImpl implements VipCenterService {
+
+    //店长升级金额
+    @Value("${storeManagerAmount}")
+    private BigDecimal storeManagerAmount;
+
+    //代理升级金额
+    @Value("${agentAmount}")
+    private BigDecimal agentAmount;
+
+    //市代理升级金额
+    @Value("${cityAgentAmount}")
+    private BigDecimal cityAgentAmount;
+
+    @Value("${redis.key.prefix.orderId}")
+    private String REDIS_KEY_PREFIX_ORDER_ID;
+
+    @Autowired
+    private RedisService redisService;
+
+    @Autowired
+    private OmsOrderMapper orderMapper;
+
+    @Override
+    public BigDecimal getUpgradeAmount(Long memberLevelId) {
+        BigDecimal amount = null;
+        if (MemberLevel.Partner.getValue() == memberLevelId){
+            amount = storeManagerAmount;
+        }
+        if (MemberLevel.Diamond.getValue() == memberLevelId){
+            amount = agentAmount;
+        }
+        if (MemberLevel.OneDiamond.getValue() == memberLevelId){
+            amount = cityAgentAmount;
+        }
+
+        return amount;
+    }
+
+    /**
+     * 创建购买权益订单
+     * @param param
+     * @return
+     */
+    @Override
+    public CommonResult createUpgradeOrder(OmsOrderDTO param) {
+        if (param == null){
+            return CommonResult.validateFailed("订单数据为空");
+        }else {
+            //创建权益订单
+            OmsOrder order = new OmsOrder();
+            BeanUtils.copyProperties(param, order);
+            order.setOrderSn(generateUpgradeOrderSn(param));  //生成orderSn
+            order.setCreateTime(new Date());  //创建订单时间
+            order.setStatus(0); //订单状态--未支付
+            order.setOrderType(3); //订单类型--虚拟订单
+            orderMapper.insert(order);
+
+            //返回订单id
+            Map<String, Object> result = new HashMap<>();
+            result.put("orderId", order.getId());
+            return CommonResult.success(result, "下单成功");
+        }
+    }
+
+    /**
+     * 生成18位订单编号:8位日期+2位订单类型+2位支付方式+6位以上自增id
+     */
+    private String generateUpgradeOrderSn(OmsOrderDTO param) {
+        StringBuilder sb = new StringBuilder();
+        String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
+        String key = REDIS_KEY_PREFIX_ORDER_ID + date;
+        Long increment = redisService.increment(key, 1);
+        sb.append(date);
+        sb.append(String.format("%02d", param.getOrderType()));
+        sb.append(String.format("%02d", param.getPayType()));
+        String incrementStr = increment.toString();
+        if (incrementStr.length() <= 6) {
+            sb.append(String.format("%06d", increment));
+        } else {
+            sb.append(incrementStr);
+        }
+        return sb.toString();
+    }
+}
--- a/mall-portal/src/main/java/com/buy507/mall/portal/vo/OmsOrderDTO.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/vo/OmsOrderDTO.java
@@ -0,0 +1,29 @@
+package com.buy507.mall.portal.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OmsOrderDTO {
+
+    @ApiModelProperty(value = "用户id")
+    private Long memberId;
+
+    @ApiModelProperty(value = "用户帐号")
+    private String memberUsername;
+
+    @ApiModelProperty(value = "应付金额（实际支付金额）")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty(value = "支付方式：0->未支付；1->支付宝；2->微信；3->线下支付；4->积分支付；5—>余额支付")
+    private Integer payType;
+
+    @ApiModelProperty(value = "订单类型：0->正常订单；1->秒杀订单；3->虚拟订单")
+    private Integer orderType;
+}
--- a/mall-portal/src/main/java/com/buy507/mall/portal/vo/TransactionCashVo.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/vo/TransactionCashVo.java
@@ -1,10 +1,13 @@
 package com.buy507.mall.portal.vo;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;

@Data
@AllArgsConstructor
@@ -18,5 +21,6 @@ public class TransactionCashVo implements Serializable {
    private String remarks;

    //时间
-    private Data transferPaymentTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date transferPaymentTime;
 }
--- a/mall-portal/src/main/java/com/buy507/mall/portal/vo/TransactionPointsVo.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/vo/TransactionPointsVo.java
@@ -1,10 +1,13 @@
 package com.buy507.mall.portal.vo;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;

@Data
@AllArgsConstructor
@@ -17,5 +20,6 @@ public class TransactionPointsVo implements Serializable {
    private String remarks;

    //时间
-    private Data transferPaymentTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date transferPaymentTime;
 }
--- a/mall-portal/src/main/resources/application.yml
+++ b/mall-portal/src/main/resources/application.yml
@@ -8,6 +8,9 @@ mybatis:
  mapper-locations:
    - classpath:dao/*.xml
    - classpath*:com/**/mapper/*.xml
+  configuration:
+    #开启驼峰命名
+    map-underscore-to-camel-case: true
  
 jwt:
  tokenHeader: Authorization #JWT存储的请求头
--- a/mall-portal/src/main/resources/dao/HomeDao.xml
+++ b/mall-portal/src/main/resources/dao/HomeDao.xml
@@ -80,7 +80,7 @@
    </select>

    <select id="getProductVipStatus" resultType="com.buy507.mall.model.PmsProduct">
-        SELECT p.*
+        SELECT *
        FROM
            pms_product
        WHERE
@@ -89,7 +89,7 @@
    </select>

    <select id="getProductpointSareaStatus" resultType="com.buy507.mall.model.PmsProduct">
-        SELECT p.*
+        SELECT *
        FROM
            pms_product
        WHERE
@@ -99,7 +99,7 @@

    <select id="getProductpointsExchangeStatus" resultType="com.buy507.mall.model.PmsProduct">

-        SELECT p.*
+        SELECT *
        FROM
            pms_product
        WHERE
@@ -108,7 +108,7 @@
    </select>

    <select id="getVipStatusList" resultType="com.buy507.mall.model.PmsProduct">
-        SELECT p.*
+        SELECT *
        FROM
            pms_product
        WHERE
@@ -116,7 +116,7 @@
    </select>

    <select id="getPointStatusList" resultType="com.buy507.mall.model.PmsProduct">
-        SELECT p.*
+        SELECT *
        FROM
            pms_product
        WHERE
@@ -124,7 +124,7 @@
    </select>

    <select id="getPointExchangeProductList" resultType="com.buy507.mall.model.PmsProduct">
-        SELECT p.*
+        SELECT *
        FROM
            pms_product
        WHERE
Author	SHA1	Message	Date
zhanghb	565c82305c	Merge remote-tracking branch 'origin/main-zhb' # Conflicts: # mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java # mall-dao/src/main/java/com/buy507/mall/mapper/PmsProductMapper.java # mall-dao/src/main/resources/com/buy507/mall/mapper/PmsProductMapper.xml	2025-02-26 10:40:51 +08:00
chenxin	6e329f4226	Merge pull request 'main-cx' (#15 ) from main-cx into main Reviewed-on: #15	2025-02-26 10:36:15 +08:00
zhanghb	fdec029158	会员中心、添加商品	2025-02-26 10:36:03 +08:00
chenxin	dab9156c8f	Merge remote-tracking branch 'origin/main' into main-cx	2025-02-26 10:35:39 +08:00
chenxin	419f7c9886	提交最终代码	2025-02-26 10:34:54 +08:00
zhanghb	153dc8751e	修改更新发展基金、个人钱包业务逻辑	2025-02-22 15:59:12 +08:00