Эх сурвалжийг харах

fix:bug 提现记录 驳回后钱不回滚 提现审核通过才扣钱

wrj 11 сар өмнө
parent
commit
9e636e7ba6

+ 2 - 2
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TTxRecordController.java

@@ -51,11 +51,11 @@ public class TTxRecordController {
         }
     }
 
-    @ApiOperation("审核通过")
+    @ApiOperation("审核通过/驳回")
     @RequestMapping(value = "wx/auditing", method = RequestMethod.POST)
     public R auditing(@RequestBody TTxRecord record) {
         try {
-            return R.ok(recordService.updateById(record));
+            return R.ok(recordService.auditing(record));
         } catch (ServiceException s) {
             log.error(s.getMessage());
             return R.fail(s.getMessage());

+ 2 - 0
nightFragrance-massage/src/main/java/com/ylx/massage/service/TTxRecordService.java

@@ -10,4 +10,6 @@ import com.ylx.massage.domain.TTxRecord;
 public interface TTxRecordService extends IService<TTxRecord> {
 
     TTxRecord applicationCash(TTxRecord record);
+
+    Object auditing(TTxRecord record);
 }

+ 15 - 3
nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TTxRecordServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 
 /**
@@ -72,6 +73,20 @@ public class TTxRecordServiceImpl extends ServiceImpl<TTxRecordMapper, TTxRecord
         record.setnStatus(TTxRecordEnum.PASS_ING.getCode());
         record.setDtCreateTime(LocalDateTime.now());
         record.setCashNo(orderNumberGenerator.generateNextOrderNumber(OrderNumberGenerator.KEY_PREFIX_CASH));
+        this.save(record);
+        return record;
+    }
+
+    @Override
+    public Object auditing(TTxRecord record) {
+        boolean b = this.updateById(record);
+        if (Objects.equals(record.getnStatus(), TTxRecordEnum.PASS.getCode())) {
+            extracted(record);
+        }
+        return b;
+    }
+
+    private void extracted(TTxRecord record) {
         UpdateWrapper<TWxUser> businessUpdateWrapper = new UpdateWrapper<>();
         businessUpdateWrapper.lambda().eq(TWxUser::getcOpenid, record.getcOpenId());
         businessUpdateWrapper.lambda().setSql(" d_balance = d_balance - " + record.getdPrice());
@@ -85,8 +100,5 @@ public class TTxRecordServiceImpl extends ServiceImpl<TTxRecordMapper, TTxRecord
         tConsumptionLog.setBillType(4);
         tConsumptionLog.setNote("提现");
         consumptionLogService.save(tConsumptionLog);
-
-        this.save(record);
-        return record;
     }
 }