Merge branch 'master' of 450099795/FragrantTown_Server_Local into master

src/main/java/com/td/boss/game/comcnttosnb/service/ComCntToSnbServiceImpl.java

@@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.swing.plaf.ProgressBarUI;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Date;
@@ -134,15 +133,15 @@ public class ComCntToSnbServiceImpl extends CommonServiceImpl<ComCntToSnbVo, Com
             snbTran.setUserId(userId);
             snbTran.setTranName("领取SNB");
 //            snbTran.setTranType();
-            snbTran.setTranAmount(Convert.toInt(thisReceiveQuantity));
+            snbTran.setTranAmount(0);
 //            snbTran.setTranPrice();
             snbTran.setTranDescribe(StrUtil.format("user领取SNB、本次领取：{},剩余：{}", thisReceiveQuantity, comCntToSnb.getTotalQuantity().subtract(comCntToSnb.getReceivedQuantity())));
             snbTran.setIsAdd(1);
-            snbTran.setBeforeSnb(0);
+            snbTran.setBeforeSnb(comUsersVo.getSnb());
             snbTran.setTranSnb(0);
-            snbTran.setAfterSnb(0);
+            snbTran.setAfterSnb(comUsersVo.getSnb());
             // 交易的部分数据
-//            snbTran.setTranAmountPart(0d);
+            snbTran.setTranAmountPart(Convert.toDouble(thisReceiveQuantity));
             // 交易的snb
             snbTran.setTranSnbPart(Convert.toDouble(thisReceiveQuantity));
             // 交易之前的snb