fix

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

@@ -130,8 +130,8 @@ public class UserGalaxyCoinServiceImpl implements UserGalaxyCoinService {
 			BigDecimal remainGalaxyCoin = userGalaxyCoinRecord.getRemainGalaxyCoin();
 			if (remainGalaxyCoin.compareTo(BigDecimal.ZERO) > 0) {
 				//扣除记录 对应的银河币不可用
+				log.info("订单退款，扣除该笔订单oid:{}返现的银河币", orderId);
 				sendGalaxyCoinHandle(userGalaxyCoinRecord.getUserId(), orderId, remainGalaxyCoin.negate().intValue(), PointsRecordConst.ORDER_REFUND_SUB, true, false, source);
-				userGalaxyCoinRecord.setRemainGalaxyCoin(BigDecimal.ZERO);
 				userGalaxyCoinRecord.setIsUsed(Boolean.TRUE);
 				userGalaxyCoinRecordMapper.updateById(userGalaxyCoinRecord);
 			}
@@ -150,7 +150,7 @@ public class UserGalaxyCoinServiceImpl implements UserGalaxyCoinService {
 				.last("limit 1"));
 		if (orderDonGalaxyCoinRecord != null) {
 			//使用记录
-			recordUseRecord(orderId, userId, orderDonGalaxyCoinRecord.getGalaxyCoin(), PointsRecordConst.ORDER, false, source);
+			recordUseRecord(orderId, userId, orderDonGalaxyCoinRecord.getGalaxyCoin().negate(), PointsRecordConst.ORDER, false, source);
 			orderDonGalaxyCoinRecord.setRefundGalaxyCoin(orderDonGalaxyCoinRecord.getGalaxyCoin());
 			orderDonGalaxyCoinRecord.setOrderId(orderId);
 			orderDonGalaxyCoinRecordMapper.updateById(orderDonGalaxyCoinRecord);

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -587,7 +587,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                         .last("limit 1"));
                 if (orderDonGalaxyCoinRecord != null) {
                     //有效时，返还银河币 并记录
-                    userGalaxyCoinService.recordOrderRefundGalaxyCoinIfValid(orderDon.getId(), orderDonGalaxyCoinRecord.getUserId(), orderDonGalaxyCoinRecord.getGalaxyCoin(), OrderDonGalaxyCoinRecord.Source.upgrade);
+                    userGalaxyCoinService.recordOrderRefundGalaxyCoinIfValid(orderDon.getId(), orderDonGalaxyCoinRecord.getUserId(), orderDonGalaxyCoinRecord.getGalaxyCoin().abs(), OrderDonGalaxyCoinRecord.Source.upgrade);
                 }
             }
             //扣除 该笔订单产生的返现银河币
@@ -1081,7 +1081,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                     .last("limit 1"));
             if (orderDonGalaxyCoinRecord != null) {
                 //有效时，返还银河币 并记录
-                userGalaxyCoinService.recordOrderRefundGalaxyCoinIfValid(orderDon.getId(), orderDonGalaxyCoinRecord.getUserId(), orderDonGalaxyCoinRecord.getGalaxyCoin(), OrderDonGalaxyCoinRecord.Source.ordinary);
+                userGalaxyCoinService.recordOrderRefundGalaxyCoinIfValid(orderDon.getId(), orderDonGalaxyCoinRecord.getUserId(), orderDonGalaxyCoinRecord.getGalaxyCoin().abs(), OrderDonGalaxyCoinRecord.Source.ordinary);
             }
         }
 

netflix-service/src/main/java/com/cyksj/service/mange/vip/impl/CmsVipOrderServiceImpl.java

@@ -113,7 +113,7 @@ public class CmsVipOrderServiceImpl implements CmsVipOrderService {
 					.last("limit 1"));
 			if (orderDonGalaxyCoinRecord != null) {
 				//有效时，返还银河币 并记录
-				userGalaxyCoinService.recordOrderRefundGalaxyCoinIfValid(orderDon.getId(), orderDonGalaxyCoinRecord.getUserId(), orderDonGalaxyCoinRecord.getGalaxyCoin(), OrderDonGalaxyCoinRecord.Source.vip);
+				userGalaxyCoinService.recordOrderRefundGalaxyCoinIfValid(orderDon.getId(), orderDonGalaxyCoinRecord.getUserId(), orderDonGalaxyCoinRecord.getGalaxyCoin().abs(), OrderDonGalaxyCoinRecord.Source.vip);
 			}
 		}
 		//扣除 该笔订单产生的返现银河币