01-12 0金币消费与退款订单传erp

src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java

@@ -198,6 +198,7 @@ public class AuditServiceImpl implements AuditService {
                 //erp增加退款数据
                 if(oldOrder.getType()==1){
                     int  type = 2;
+                    if (order.getPermanentGold()!=0||order.getFreeJune()!=0||order.getFreeDecember()!=0||order.getTaskGold()!=0){
                           GoldTistV2.addCoinNew(order.getJwcode().toString(), 55, //退款免费-商品
                             (double) (order.getFreeDecember()+order.getFreeJune()) /100,SimpleIdGenerator.generateId(),
                             order.getRemark(),0, auditName, "退款商品"+order.getGoodsName());
@@ -206,7 +207,12 @@ public class AuditServiceImpl implements AuditService {
                             order.getRemark(),order.getPermanentGold(), auditName, "退款商品"+order.getGoodsName());
                           GoldTistV2.addCoinNew(order.getJwcode().toString(), 57, //退款任务-商品
                             (double) (order.getTaskGold() ) /100,SimpleIdGenerator.generateId(),
-                            order.getRemark(),0, auditName, "退款商品"+order.getGoodsName());
+                            order.getRemark(),0, auditName, "退款商品"+order.getGoodsName());}
+                    else {
+                        //0金币消耗，往erp传一条金币为空的记录
+                         GoldTistV2.addCoinRecordNew(String.valueOf(order.getJwcode()), order.getRemark(),auditName,order.getGoodsName());
+
+                        }
                           //如果是旧订单，发送报警
                         if (AuditContext.getRedCheckResult().equals("old")){
                         Exception e = new Exception("旧订单退款");
@@ -222,7 +228,7 @@ public class AuditServiceImpl implements AuditService {
                 else if (oldOrder.getType()==0){
                     //判断够不够扣
 
-                    if(userNow.getNowPermanentGold().compareTo(BigDecimal.valueOf(Math.abs(order.getPermanentGold()))) < 0 
+                    if(userNow.getNowPermanentGold().compareTo(BigDecimal.valueOf(Math.abs(order.getPermanentGold()))) < 0
                        || userNow.getNowFreeGold().compareTo(BigDecimal.valueOf(Math.abs(order.getFreeDecember() + order.getFreeJune()))) < 0 
                        || userNow.getNowTaskGold().compareTo(BigDecimal.valueOf(Math.abs(order.getTaskGold()))) < 0){
                         log.error("用户余额不足，无法退款");

src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java

@@ -185,6 +185,10 @@ public class ConsumeServiceImpl implements ConsumeService {
             }
         }
     }
+       //0金币消耗，往erp传一条金币为空的记录
+       else if (consumeUser.getPermanentGold().compareTo(BigDecimal.ZERO)==0&&consumeUser.getFreeGold().compareTo(BigDecimal.ZERO)==0&&consumeUser.getTaskGold().compareTo(BigDecimal.ZERO)==0){
+       GoldTistV2.addCoinRecordNew(String.valueOf(consumeUser.getJwcode()), consumeUser.getRemark(),consumeUser.getAdminName(),consumeUser.getGoodsName());
+    }
         consumeMapper.add(userGoldRecord);
         consumeMapper.updateUserGold(userGoldRecord);
         User user = new User();