fix

netflix-service/src/main/java/com/cyksj/service/coin/UserGalaxyCoinService.java

@@ -19,4 +19,6 @@ public interface UserGalaxyCoinService {
 	void subOrderGenerateGalaxyCoin(Long orderId);
 
 	void handleUserGalaxyCoinOrderNotify(Long orderId, Long userId, String orderNo, Boolean ivVip);
+
+	void sendOrderCashback(Long orderId, Long userId, Integer galaxyCoin, String remark);
 }

netflix-service/src/main/java/com/cyksj/service/coin/impl/UserGalaxyCoinServiceImpl.java

@@ -125,6 +125,7 @@ public class UserGalaxyCoinServiceImpl implements UserGalaxyCoinService {
 	public void subOrderGenerateGalaxyCoin(Long orderId) {
 		UserGalaxyCoinRecord userGalaxyCoinRecord = userGalaxyCoinRecordMapper.selectOne(Wrappers.lambdaQuery(UserGalaxyCoinRecord.class)
 				.eq(UserGalaxyCoinRecord::getOrderId, orderId)
+				.eq(UserGalaxyCoinRecord::getRemark, PointsRecordConst.ORDER_CASHBACK)
 				.last("limit 1"));
 		if (userGalaxyCoinRecord != null) {
 			BigDecimal remainGalaxyCoin = userGalaxyCoinRecord.getRemainGalaxyCoin();
@@ -153,4 +154,9 @@ public class UserGalaxyCoinServiceImpl implements UserGalaxyCoinService {
 			orderDonGalaxyCoinRecordMapper.updateById(orderDonGalaxyCoinRecord);
 		}
 	}
+
+	@Override
+	public void sendOrderCashback(Long orderId, Long userId, Integer galaxyCoin, String remark) {
+		sendGalaxyCoinHandle(userId, orderId, galaxyCoin, remark, true, true);
+	}
 }

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -4970,10 +4970,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					GalaxyCoinConsumeRateDto galaxyCoinConsumeRateDto = Jsons.parseObject(galaxyCoinConsumeReturnRateConfig.getSysValue(), GalaxyCoinConsumeRateDto.class);
 					BigDecimal moneyAvg = galaxyCoinConsumeRateDto.getMoney();
 					//返回银河币倍数
-					BigDecimal number = money.divide(moneyAvg);
+					BigDecimal number = money.divide(moneyAvg, 0);
 					retrunGalaxyCoin = number.multiply(galaxyCoinConsumeRateDto.getGalaxyCoin());
 					//发送银河币并记录
-					userGalaxyCoinService.sendGalaxyCoinRecord(userId, retrunGalaxyCoin.intValue(), PointsRecordConst.ORDER_CASHBACK, false);
+					userGalaxyCoinService.sendOrderCashback(orderDon.getId(), userId, retrunGalaxyCoin.intValue(), PointsRecordConst.ORDER_CASHBACK);
 				} catch (Exception e) {
 					log.error("发送用户：{}银河币points：{}错误:{}", userId, retrunGalaxyCoin, StringUtil.getErrorText(e));
 				}

netflix-service/src/main/java/com/cyksj/service/order/impl/VipOrderDonServiceImpl.java

@@ -870,10 +870,10 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 					GalaxyCoinConsumeRateDto galaxyCoinConsumeRateDto = Jsons.parseObject(galaxyCoinConsumeReturnRateConfig.getSysValue(), GalaxyCoinConsumeRateDto.class);
 					BigDecimal moneyAvg = galaxyCoinConsumeRateDto.getMoney();
 					//返回银河币倍数
-					BigDecimal number = money.divide(moneyAvg);
+					BigDecimal number = money.divide(moneyAvg, 0);
 					retrunGalaxyCoin = number.multiply(galaxyCoinConsumeRateDto.getGalaxyCoin());
 					//发送银河币并记录
-					userGalaxyCoinService.sendGalaxyCoinRecord(userId, retrunGalaxyCoin.intValue(), PointsRecordConst.ORDER_CASHBACK, false);
+					userGalaxyCoinService.sendOrderCashback(orderDon.getId(), userId, retrunGalaxyCoin.intValue(), PointsRecordConst.ORDER_CASHBACK);
 				} catch (Exception e) {
 					log.error("发送会员用户：{}银河币points：{}错误:{}", userId, retrunGalaxyCoin, StringUtil.getErrorText(e));
 				}