fix

netflix-dao/src/main/java/com/cyksj/mapper/UserGalaxycoinRecordMapper.java

@@ -1,11 +0,0 @@
-package com.cyksj.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.UserGalaxycoinRecord;
-
-/**
- * @author zwhui
- * @date 2023/10/12 10:23
- */
-public interface UserGalaxycoinRecordMapper extends BaseMapper<UserGalaxycoinRecord> {
-}

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDon.java

@@ -241,11 +241,6 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private BigDecimal balance;
 
-    /**
-     * 银河币
-     */
-    private BigDecimal galaxycoin;
-
     /**
      * 付款说明
      */
@@ -333,7 +328,6 @@ public class OrderDon extends BaseEntity implements Serializable {
         EQUIPMENT("equipment", "实物设备分销"),
         PAY_EQUIPMENT("pay_equipment", "自购设备"),
         BALANCE("balance", "余额支付"),
-        GALAXYCOIN("galaxycoin", "银河币支付"),
         PAYPAL("paypal","paypal支付"),
         STRIPE("stripe","stripe支付")
         ;

netflix-dao/src/main/java/com/cyksj/model/entity/UserGalaxycoinRecord.java

@@ -1,36 +0,0 @@
-package com.cyksj.model.entity;
-
-import com.ejlchina.searcher.bean.SearchBean;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-/**
- * @author zwhui
- * @date 2023/10/12 09:58
- */
-@Getter
-@Setter
-@SearchBean(tables = "user_galaxycoin_record")
-public class UserGalaxycoinRecord extends BaseEntity{
-    private Long userId;
-
-    private BigDecimal galaxycoin;
-
-    private String remark;
-
-    private Source source;
-
-    @Getter
-    public enum Source {
-        payment("下单"),
-        refund("订单退款");
-        String desc;
-
-        Source(String desc) {
-            this.desc = desc;
-        }
-    }
-
-}

netflix-dao/src/main/java/com/cyksj/model/views/UserPersonalView.java

@@ -50,9 +50,4 @@ public class UserPersonalView {
 	private Integer numOfGiftCard;
 
 	private String phone;
-
-	/**
-	 * 银河币
-	 */
-	private BigDecimal galaxycoin;
 }

netflix-service/src/main/java/com/cyksj/service/user/UserGalaxycoinRecordService.java

@@ -1,11 +0,0 @@
-package com.cyksj.service.user;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.cyksj.model.entity.UserGalaxycoinRecord;
-
-/**
- * @author zwhui
- * @date 2023/10/12 13:34
- */
-public interface UserGalaxycoinRecordService extends IService<UserGalaxycoinRecord> {
-}

netflix-service/src/main/java/com/cyksj/service/user/impl/UserBenefitsServiceImpl.java

@@ -1,187 +0,0 @@
-package com.cyksj.service.user.impl;
-
-import com.cyksj.common.EnvCommonService;
-import com.cyksj.common.constant.Constant;
-import com.cyksj.mapper.DistributeOrdersDeductPointsRecordMapper;
-import com.cyksj.mapper.UserBalanceSourceRecordMapper;
-import com.cyksj.mapper.UserGalaxycoinRecordMapper;
-import com.cyksj.mapper.UserMapper;
-import com.cyksj.mapper.shop.YhShopDistributeOrdersDeductPointsRecordMapper;
-import com.cyksj.model.entity.DistributeOrdersDeductPointsRecord;
-import com.cyksj.model.entity.User;
-import com.cyksj.model.entity.UserBalanceSourceRecord;
-import com.cyksj.model.entity.YhShopDistributeOrdersDeductPointsRecord;
-import com.cyksj.service.sms.SmsService;
-import com.cyksj.service.user.UserBenefitsService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-/*
- *项目名: netflix
- *文件名: UserBenefitsServiceImpl
- *创建者: JavaZou
- *创建时间:2023/5/18 16:06
- */
-@Service
-@RequiredArgsConstructor
-public class UserBenefitsServiceImpl implements UserBenefitsService {
-	private final UserMapper userMapper;
-
-	private final DistributeOrdersDeductPointsRecordMapper distributeOrdersDeductPointsRecordMapper;
-
-	private final UserBalanceSourceRecordMapper userBalanceSourceRecordMapper;
-
-	private final EnvCommonService envCommonService;
-
-	private final SmsService smsService;
-
-	private final YhShopDistributeOrdersDeductPointsRecordMapper yhShopDistributeOrdersDeductPointsRecordMapper;
-
-	private final UserGalaxycoinRecordMapper userGalaxycoinRecordMapper;
-
-	@Override
-	public void deductDistributePoints(Long orderId, Long userId, BigDecimal deductPoints) {
-		if (deductPoints.compareTo(BigDecimal.ZERO) <= 0) {
-			return;
-		}
-		while (true) {
-			User user = userMapper.selectById(userId);
-			if (user == null) break;
-			BigDecimal points = user.getPoints();
-			Integer success = userMapper.subPointsNegative(userId, points, deductPoints);
-			if (success == 1){
-				//记录积分已发送后,退款后扣除积分记录
-				deductPointsRecord(orderId, userId, deductPoints);
-				break;
-			}
-		}
-	}
-
-	@Override
-	public void addDistributePoints(Long userId, BigDecimal addPoints) {
-		if (addPoints.compareTo(BigDecimal.ZERO) <= 0) {
-			return;
-		}
-		while (true) {
-			User user = userMapper.selectById(userId);
-			if (user == null) break;
-			BigDecimal points = user.getPoints();
-			Integer success = userMapper.updatePoints(user.getId(), points, addPoints);
-			if (success == 1) break;
-		}
-	}
-
-	@Override
-	public void addUserBalance(Long userId, BigDecimal addBalance, UserBalanceSourceRecord.Source source, Long yhsId, Long orderId, String detail, Boolean isRecord) {
-		if (addBalance.compareTo(BigDecimal.ZERO) <= 0) {
-			return;
-		}
-		while (true) {
-			User user = userMapper.selectById(userId);
-			if (user == null) break;
-			BigDecimal balance = user.getBalance();
-			Integer success = userMapper.addUserBalance(user.getId(), balance, addBalance);
-			if (success == 1) {
-				if (isRecord) {
-					recordBalanceBySource(userId, addBalance, source, orderId, detail);
-				}
-				if (envCommonService.isPrdEnv() && isRecord && yhsId == 0) {
-					try {
-						//短信到账提醒
-						String msg = String.format(Constant.BALANCE_NOTIFY_MSG, addBalance.divide(BigDecimal.valueOf(100)));
-						smsService.sendSmsToRelationUser(userId, msg);
-					} catch (Exception e) {
-					}
-				}
-				break;
-			}
-		}
-	}
-
-	@Override
-	public void deductUserBalance(Long userId, BigDecimal subBalance) {
-		if (subBalance.compareTo(BigDecimal.ZERO) <= 0) {
-			return;
-		}
-		while (true) {
-			User user = userMapper.selectById(userId);
-			if (user == null) break;
-			BigDecimal balance = user.getBalance();
-			Integer success = userMapper.deductUserBalance(user.getId(), balance, subBalance);
-			if (success == 1) break;
-		}
-	}
-
-	public void deductPointsRecord(Long orderId, Long userId, BigDecimal deductPoints) {
-		try {
-			DistributeOrdersDeductPointsRecord record = new DistributeOrdersDeductPointsRecord();
-			record.setOrderId(orderId);
-			record.setUserId(userId);
-			record.setDeductPoints(deductPoints);
-			distributeOrdersDeductPointsRecordMapper.insert(record);
-		} catch (DuplicateKeyException e) {
-
-		}
-	}
-
-	@Override
-	public void recordBalanceBySource(Long userId, BigDecimal balance, UserBalanceSourceRecord.Source source, Long orderId, String detail) {
-		UserBalanceSourceRecord userBalanceSourceRecord = new UserBalanceSourceRecord();
-		userBalanceSourceRecord.setUserId(userId);
-		userBalanceSourceRecord.setBalance(balance);
-		userBalanceSourceRecord.setSource(source);
-		userBalanceSourceRecord.setOrderId(orderId);
-		userBalanceSourceRecord.setDetail(detail);
-		userBalanceSourceRecordMapper.insert(userBalanceSourceRecord);
-	}
-
-	@Override
-	public void addYhsMoney(Long userId, BigDecimal addYhsMoney) {
-		if (addYhsMoney.compareTo(BigDecimal.ZERO) <= 0) {
-			return;
-		}
-		while (true) {
-			User user = userMapper.selectById(userId);
-			if (user == null) break;
-			BigDecimal yhsMoney = user.getYhsMoney();
-			Integer success = userMapper.addYhsMoney(user.getId(), yhsMoney, addYhsMoney);
-			if (success == 1) {
-				break;
-			}
-		}
-	}
-
-	@Override
-	public void deductYhShopTakeMoney(Long orderId, Long shopUserId, BigDecimal deductMoney) {
-		if (deductMoney.compareTo(BigDecimal.ZERO) <= 0) {
-			return;
-		}
-		while (true) {
-			User user = userMapper.selectById(shopUserId);
-			if (user == null) break;
-			BigDecimal yhsMoney = user.getYhsMoney();
-			Integer success = userMapper.subYhShopUserMoney(shopUserId, yhsMoney, deductMoney);
-			if (success == 1){
-				//记录提成已发送后,退款后扣除用户店铺提成 记录
-				deductYhsMoneyRecord(orderId, shopUserId, deductMoney);
-				break;
-			}
-		}
-	}
-
-	private void deductYhsMoneyRecord(Long orderId, Long shopUserId, BigDecimal deductMoney) {
-		try {
-			YhShopDistributeOrdersDeductPointsRecord record = new YhShopDistributeOrdersDeductPointsRecord();
-			record.setOrderId(orderId);
-			record.setShopUserId(shopUserId);
-			record.setDeductMoney(deductMoney);
-			yhShopDistributeOrdersDeductPointsRecordMapper.insert(record);
-		} catch (DuplicateKeyException e) {
-
-		}
-	}
-}

netflix-service/src/main/java/com/cyksj/service/user/impl/UserGalaxycoinRecordServiceImpl.java

@@ -1,17 +0,0 @@
-package com.cyksj.service.user.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cyksj.mapper.UserGalaxycoinRecordMapper;
-import com.cyksj.model.entity.UserGalaxycoinRecord;
-import com.cyksj.service.user.UserGalaxycoinRecordService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * @author zwhui
- * @date 2023/10/12 13:35
- */
-@Service
-@RequiredArgsConstructor
-public class UserGalaxycoinRecordServiceImpl extends ServiceImpl<UserGalaxycoinRecordMapper, UserGalaxycoinRecord> implements UserGalaxycoinRecordService {
-}