9-9 退款金币审核

src/main/java/com/example/demo/mapper/coin/AuditMapper.java

@@ -31,7 +31,7 @@ public interface AuditMapper {
     int updateOrder (UserGoldRecord userGoldRecord);
     //修改用户余额
     int updateUserGold(User user);
-    //修改消费订单为以退款
+    //修改消费订单为已退款
     int updateOrderRefund(String orderCode ,Byte isRefund);
     //多条件查询充值审核订单
     List<RechargeAudit> selectRechargeBy(@Param("pageNum") Integer pageNum,

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

@@ -66,12 +66,12 @@ public class AuditServiceImpl implements AuditService {
         if (action==2){     //驳回
 
             if (order.getType()==2) {  //退款
-                //2.获取对应的消费订单（退款订单号去掉开头"TK"即为对应消费订单）
-                String consumeOrderCode = order.getOrderCode().replaceFirst("TK_", "");
+                //2.获取对应的订单（退款订单号去掉开头"TK"即为对应原始订单）
+                String oldOrderCode = order.getOrderCode().replaceFirst("TK_", "");
                 //3.更新消费订单是否已退款状态为0
-                UserGoldRecord consumeOrder = auditMapper.selectAllOrderByOrderCode(consumeOrderCode);
-                if (consumeOrderCode != null&&consumeOrder.getType()==1){   //确保是消费订单
-                    auditMapper.updateOrderRefund(consumeOrderCode,(byte)0);
+                UserGoldRecord oldOrder = auditMapper.selectAllOrderByOrderCode(oldOrderCode);
+                if (oldOrderCode != null&&(oldOrder.getType()==1||oldOrder.getType()==0)){   //确保是消费或充值订单
+                    auditMapper.updateOrderRefund(oldOrderCode,(byte)0);
                 }else {
                     throw new IllegalArgumentException("找不到对应的订单或不是有效订单");
                 }  }
@@ -115,12 +115,15 @@ public class AuditServiceImpl implements AuditService {
             //    if(update.getJwcode().equals(94226013)){
                     GoldTistV2.addCoinNew(order.getJwcode().toString(), 64, //充值永久金币
                             (double) (order.getPermanentGold() ) /100,
-                            order.getRemark(),0, auditName, "金币充值");
+                            order.getRemark(),(double) (order.getPermanentGold() ) /100, auditName, "金币充值");
                     GoldTistV2.addCoinNew(order.getJwcode().toString(), 63, //充值免费
                             (double) (order.getFreeDecember()+order.getFreeJune() ) /100,
                             order.getRemark(),0, auditName, "金币充值");
            //     }
             }else if (order.getType()==2) {  //退款
+                //2.获取对应的订单（退款订单号去掉开头"TK"即为对应原始订单）
+                String oldOrderCode = order.getOrderCode().replaceFirst("TK_", "");
+                UserGoldRecord oldOrder = auditMapper.selectAllOrderByOrderCode(oldOrderCode);
                 //更新用户余额
                 User update = new User();
                 update.setJwcode(order.getJwcode());
@@ -130,17 +133,26 @@ public class AuditServiceImpl implements AuditService {
                 update.setCurrentTaskGold(BigDecimal.valueOf(order.getTaskGold())); //当前任务金币
                 auditMapper.updateUserGold(update);
                 //erp增加退款数据
-             //   if(update.getJwcode().equals(94226013)){
-                    GoldTistV2.addCoinNew(order.getJwcode().toString(), 56, //退款永久金币
-                            (double) (order.getPermanentGold() ) /100,
+                if(oldOrder.getType()==1){ //消费
+                          GoldTistV2.addCoinNew(order.getJwcode().toString(), 55, //退款免费-商品
+                            (double) (order.getFreeDecember()+order.getFreeJune()) /100,
                             order.getRemark(),0, auditName, "退款商品"+order.getGoodsName());
-                    GoldTistV2.addCoinNew(order.getJwcode().toString(), 55, //退款免费
-                            (double) (order.getFreeDecember()+order.getFreeJune() ) /100,
-                            order.getRemark(),0, auditName, "退款商品"+order.getGoodsName());
-                    GoldTistV2.addCoinNew(order.getJwcode().toString(), 57, //退款任务
+                          GoldTistV2.addCoinNew(order.getJwcode().toString(), 56, //退款永久-商品
+                            (double) (order.getPermanentGold()) /100,
+                            order.getRemark(),order.getPermanentGold(), auditName, "退款商品"+order.getGoodsName());
+                          GoldTistV2.addCoinNew(order.getJwcode().toString(), 57, //退款任务-商品
                             (double) (order.getTaskGold() ) /100,
                             order.getRemark(),0, auditName, "退款商品"+order.getGoodsName());
-              //  }
+                } else if (oldOrder.getType()==0){//充值金币
+                    if(order.getTaskGold()==0){ //无任务金币统一走免费+永久
+                    GoldTistV2.addCoinNew(order.getJwcode().toString(), 58, //退款免费+永久金币-充值
+                        (double) (order.getFreeDecember()+order.getFreeJune()+order.getPermanentGold() ) /100,
+                        order.getRemark(),(double) order.getPermanentGold() / 100, auditName, "退款金币充值");}
+                    if (order.getTaskGold()!=0)
+                    GoldTistV2.addCoinNew(order.getJwcode().toString(), 59, //退款任务+永久金币-充值
+                        (double) (order.getTaskGold()+order.getPermanentGold() ) /100,
+                        order.getRemark(),(double) order.getPermanentGold() / 100, auditName, "退款金币充值");
+                }
 
             }
             updateOrder.setAuditStatus(1);