交易订单

Reviewed-on: #84

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -132,10 +132,10 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
         return selectList(wrapperX);
     }
 
-    @Select(" SELECT a.status,d.label,a.create_time,a.pay_price,a.use_point,c.name,c.pic_url,b.count FROM trade_order a  " +
+    @Select(" SELECT a.id,a.status,d.label,a.create_time,a.pay_price,a.use_point,c.name,c.pic_url,b.count FROM trade_order a  " +
             " inner join trade_order_item b on a.id = b.order_id " +
             " inner join (SELECT sort, label, value, dict_type, css_class FROM system_dict_data WHERE dict_type = 'trade_order_status') d on d.sort = a.status "+
             " inner join product_spu c on b.spu_id = c.id " +
-            " where a.user_id = #{userId} and a.use_point > 0 order by a.create_time ASC ")
+            " where a.user_id = #{userId} and a.use_point > 0 order by a.create_time DESC ")
     List<AppPointOrderVO> getPointOrder(Long userId);
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeMemberUserService.java

@@ -21,6 +21,6 @@ public interface TradeMemberUserService {
 
     void updateUserDo(TradeMemberUserDO user);
 
-    void updateActivate(String cardName);
+    void updateActivate(String cardName,Long userId);
 
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeMemberUserServiceImpl.java

@@ -93,8 +93,8 @@ public class TradeMemberUserServiceImpl implements TradeMemberUserService {
     }
 
     @Override
-    public void updateActivate(String cardName) {
-        TradeMemberUserDO tradeMemberUserDO = getUser(getLoginUserId());
+    public void updateActivate(String cardName,Long userId) {
+        TradeMemberUserDO tradeMemberUserDO = getUser(userId);
         //设置个人信息的会员状态，0：未开通，1试用，2有效期，3永久
         if(cardName.equals("永久")){
             tradeMemberUserDO.setActivate(3);

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -78,7 +78,6 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.minusTime;
 import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getTerminal;
 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.ORDER_NOT_FOUND;
@@ -338,7 +337,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         PayOrderRespDTO payOrder = orderResult.getValue();
         System.out.println("交易订单成功id："+id+"和payOrderId："+payOrderId);
         //会员用户信息，支付状态修改
-        TradeMemberUserDO tradeMemberUserDO = tradeMemberUserService.getUser(getLoginUserId());
+        TradeMemberUserDO tradeMemberUserDO = tradeMemberUserService.getUser(order.getUserId());
         TradePaidMemberUserDO tradePaidMemberUserDO = tradePaidMemberUserService.getByPayOrderId(payOrderId);
         if(tradePaidMemberUserDO != null ){
             System.out.println("进入会员支付修改操作paid："+tradePaidMemberUserDO+"和member："+tradeMemberUserDO);
@@ -355,7 +354,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
             tradePaidMemberUserService.update(tradePaidMemberUserDO);
             System.out.println("成功更新会员订单paid："+tradePaidMemberUserDO);
             //更新用户会员状态
-            tradeMemberUserService.updateActivate(tradePaidMemberUserDO.getPayMemberType());
+            tradeMemberUserService.updateActivate(tradePaidMemberUserDO.getPayMemberType(),order.getUserId());
             System.out.println("成功更新用户的会员状态member："+tradeMemberUserDO);
         }
         System.out.println("会员修改操作结束!!!");

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/AppMemberPointRecordController.java

@@ -41,4 +41,15 @@ public class AppMemberPointRecordController {
         return success(BeanUtils.toBean(pageResult, AppMemberPointRecordRespVO.class));
     }
 
+
+
+    @GetMapping("/getPointInfo")
+    public CommonResult<MemberPointRecordDO> getPointInfo() {
+        MemberPointRecordDO pointInfo = pointRecordService.getPointInfo(getLoginUserId());
+        return success(pointInfo);
+    }
+
+
+
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/point/MemberPointRecordDO.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.dal.dataobject.point;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
@@ -66,4 +67,13 @@ public class MemberPointRecordDO extends BaseDO {
      */
     private Integer totalPoint;
 
+
+    //总共获得的积分
+    @TableField(exist = false)
+    private Integer addUp;
+
+    //总共消费的积分
+    @TableField(exist = false)
+    private Integer reduce;
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordService.java

@@ -39,4 +39,6 @@ public interface MemberPointRecordService {
      * @param bizId   业务编号
      */
     void createPointRecord(Long userId, Integer point, MemberPointBizTypeEnum bizType, String bizId);
+
+    MemberPointRecordDO getPointInfo(Long userId);
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java

@@ -92,4 +92,24 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
         memberPointRecordMapper.insert(record);
     }
 
+    @Override
+    public MemberPointRecordDO getPointInfo(Long userId) {
+        List<MemberPointRecordDO> memberPointRecordDOList = memberPointRecordMapper.selectList("user_id", userId);
+        Integer addUp = 0;
+        Integer reduce = 0;
+        for (int i = 0; i < memberPointRecordDOList.size(); i++) {
+            MemberPointRecordDO memberPointRecordDO = memberPointRecordDOList.get(i);
+            if (memberPointRecordDO.getPoint() > 0){ //获得积分
+                addUp = addUp + memberPointRecordDO.getPoint();
+            }
+            if (memberPointRecordDO.getPoint() < 0){  //消费积分
+                reduce = reduce + memberPointRecordDO.getPoint();
+            }
+        }
+        MemberPointRecordDO memberPointRecordDO = new MemberPointRecordDO();
+        memberPointRecordDO.setAddUp(addUp);
+        memberPointRecordDO.setReduce(reduce);
+        return memberPointRecordDO;
+    }
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java

@@ -189,6 +189,6 @@ public interface MemberUserService {
 
     void updateUserDo(MemberUserDO user);
 
-    void updateActivate(String cardName);
+    void updateActivate(String cardName,Long userId);
 
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java

@@ -38,7 +38,6 @@ import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
 
 /**
@@ -330,8 +329,8 @@ public class MemberUserServiceImpl implements MemberUserService {
     }
 
     @Override
-    public void updateActivate(String cardName) {
-        MemberUserDO memberUserDO = getUser(getLoginUserId());
+    public void updateActivate(String cardName,Long userId) {
+        MemberUserDO memberUserDO = getUser(userId);
         //设置个人信息的会员状态，0：未开通，1试用，2有效期，3永久
         if(cardName.equals("永久")){
             memberUserDO.setActivate(3);

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java

@@ -36,7 +36,6 @@ import cn.iocoder.yudao.module.member.dal.mysql.user.PaidMemberUserMapper;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getTerminal;
 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
 

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/member/AppPaidMembeController.java

@@ -186,7 +186,7 @@ public class AppPaidMembeController {
         //更新会员订单
         paidMemberUserService.update(paidMemberUserDO);
         //更新用户会员状态
-        memberUserService.updateActivate(paidMemberUserDO.getPayMemberType());
+        memberUserService.updateActivate(paidMemberUserDO.getPayMemberType(),getLoginUserId());
 //        return success(PayMemberOrderConvert.INSTANCE.convert(paidMemberUserDO.getId(),payOrderId
 //                ,paidMemberUserDO.getCardExpirationTime(),memberUserDO.getActivate()));
         return success(true);