我的首页

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserMineController.java

@@ -135,7 +135,7 @@ public class UserMineController extends BaseApiController {
     Map<String, Object> storageMap = userPrizeStorageService.getMap(
         new QueryWrapper<UserPrizeStorage>()
             .select("IFNULL(goods_num,0) as total")
-            .eq("userId", userId).eq("status", PrizeStorageStatusEnum.NOT_DISTRIBUTED));
+            .eq("user_id", userId).eq("status", PrizeStorageStatusEnum.NOT_DISTRIBUTED));
     JSONObject result = new JSONObject();
     result.put("prizeNum", Integer.valueOf(String.valueOf(storageMap.get("total"))));
 

mp-common/src/main/java/com/qs/mp/common/enums/ChannelMoneyBizTypeEnum.java

@@ -0,0 +1,41 @@
+package com.qs.mp.common.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IEnum;
+
+/**
+ *
+ * 渠道账户交易类型
+ *
+ */
+public enum ChannelMoneyBizTypeEnum implements IEnum<Integer> {
+
+  COMMISSION(1, "佣金收入"),
+  WITHDRAW(2, "提现");
+
+
+  private final int value;
+  private final String desc;
+
+  ChannelMoneyBizTypeEnum(final int value, final String desc) {
+    this.value = value;
+    this.desc = desc;
+  }
+
+  @Override
+  public Integer getValue() {
+    return value;
+  }
+
+  /**
+   * 重写toString，单个转化成json
+   * @return
+   */
+  @Override
+  public String toString() {
+    JSONObject object = new JSONObject();
+    object.put("value",value);
+    object.put("desc", desc);
+    return object.toString();
+  }
+}

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelMoneyLog.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qs.mp.common.enums.ChannelMoneyBizTypeEnum;
 import com.qs.mp.common.enums.ChannelMoneyEnum;
 import java.io.Serializable;
 import java.util.Date;
@@ -75,7 +76,7 @@ public class ChannelMoneyLog implements Serializable {
    * 关联交易ID类型
    */
   @TableField("ref_type")
-  private Integer refType;
+  private ChannelMoneyBizTypeEnum refType;
 
   /**
    * 关联交易ID

mp-service/src/main/java/com/qs/mp/channel/service/IChannelMoneyLogService.java

@@ -13,4 +13,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IChannelMoneyLogService extends IService<ChannelMoneyLog> {
 
+  /**
+   * 修改账户金额
+   * @param moneyLog
+   * @return
+   */
+  boolean changeMoney(ChannelMoneyLog moneyLog);
 }

mp-service/src/main/java/com/qs/mp/channel/service/IChannelService.java

@@ -66,7 +66,7 @@ public interface IChannelService extends IService<Channel> {
 	 * 根据channelNo统计最近几天days的经营数据
 	 */
 	public ChannelOperDataVO getChannelOperData(String channelNo, int days);
-	
+
 
 	/**
 	 * 根据ID查询渠道VO
@@ -75,11 +75,12 @@ public interface IChannelService extends IService<Channel> {
 	 * @return
 	 */
 	public ChannelVO getChannelVoById(Long channelId);
-	
-	
+
+
 
 	/**
 	 * 根据channelNo统计全部的经营数据
 	 */
 	public ChannelOperDataVO getChannelTotalOperData(String channelNo);
+
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelMoneyLogServiceImpl.java

@@ -1,10 +1,23 @@
 package com.qs.mp.channel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.domain.ChannelMoneyLog;
 import com.qs.mp.channel.mapper.ChannelMoneyLogMapper;
 import com.qs.mp.channel.service.IChannelMoneyLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.mp.channel.service.IChannelService;
+import com.qs.mp.common.enums.ChannelMoneyBizTypeEnum;
+import com.qs.mp.common.enums.ChannelMoneyEnum;
+import com.qs.mp.common.enums.ErrorCodeEnum;
+import com.qs.mp.common.exception.DataOperationException;
+import com.qs.mp.common.exception.ServiceException;
+import com.qs.mp.common.utils.LogUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
 /**
  * <p>
@@ -17,4 +30,61 @@ import org.springframework.stereotype.Service;
 @Service
 public class ChannelMoneyLogServiceImpl extends ServiceImpl<ChannelMoneyLogMapper, ChannelMoneyLog> implements IChannelMoneyLogService {
 
+  protected final Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
+
+  @Autowired
+  private IChannelService channelService;
+
+  @Override
+  public boolean changeMoney(ChannelMoneyLog moneyLog) {
+    //查询数据更新对象，用户做脏读乐观锁版本标识别
+    Channel channel = channelService.getById(moneyLog.getChannelId());
+
+    boolean income = checkIncome(moneyLog.getRefType());
+    int money = 0;
+    if (!income) {
+      //根据收支方向，将金额转负，方便统一计算
+      int negativeVal = (~(moneyLog.getLogMoney() - 1));
+      //判断账户余额是否大于支付金额
+      if(channel.getMoney() < moneyLog.getLogMoney()){
+        LogUtil.error(logger, "账户余额不足，支出失败,money:{0},logMoney:{1}", new Object[]{channel.getMoney(), moneyLog.getLogMoney()});
+        throw new DataOperationException(ErrorCodeEnum.ERROR_CODE_1008);
+      }
+      money = channel.getMoney() + negativeVal;
+      moneyLog.setMoney(money);
+      moneyLog.setLogMoney(negativeVal);
+      moneyLog.setIncomeExpense(ChannelMoneyEnum.EXPENSES);
+    } else {
+      money = channel.getMoney() + moneyLog.getLogMoney();
+      moneyLog.setMoney(money);
+      moneyLog.setIncomeExpense(ChannelMoneyEnum.INCOME);
+    }
+    LogUtil.info(logger, "channelId:{0}, money:{1}", new Object[]{channel.getChannelId() , channel.getMoney()});
+
+    //1、更新商户余额表
+    boolean rtn = channelService.update(new LambdaUpdateWrapper<Channel>().set(Channel::getMoney, money)
+            .set(ChannelMoneyBizTypeEnum.WITHDRAW == moneyLog.getRefType(), Channel::getFrozenMoney, channel.getFrozenMoney() + moneyLog.getLogMoney())
+        .eq(Channel::getChannelId, channel.getChannelId()).eq(Channel::getMoney, channel.getMoney()));
+    Assert.isTrue(rtn, "渠道余额更新失败，channelId:" + channel.getChannelId());
+
+    //2、增加余额流水记录
+    boolean logret = save(moneyLog);
+    if (!logret) {
+      LogUtil.error(logger,"插入渠道账户流水.channelId : " + moneyLog.getChannelId()
+          + "; money: " + moneyLog.getLogMoney());
+      throw new ServiceException(ErrorCodeEnum.ERROR_CODE_1009);
+    }
+    return true;
+  }
+
+  private boolean checkIncome(ChannelMoneyBizTypeEnum refType){
+    //判断收支类型是否符合预定义类型
+    if(ChannelMoneyBizTypeEnum.COMMISSION == refType){
+      return true;
+    }else if(ChannelMoneyBizTypeEnum.WITHDRAW == refType){
+      return false;
+    } else {
+      throw new DataOperationException(ErrorCodeEnum.ERROR_CODE_1007);
+    }
+  }
 }