Merge branch 'test' into dev

src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java

@@ -203,6 +203,9 @@ public class DiscSpinningController {
 
     @Transactional
     public void receiveAsync(DiscSpinningRecord receive) {
+        if (receive.getType() != 2) {
+            return;
+        }
         UserEntity userInfo = userService.queryByUserId(receive.getUserId());
         UserMoneyDetails userMoneyDetails = new UserMoneyDetails(
                 receive.getUserId(), null, null, "[现金大转盘]", 5, 1, 2,
@@ -214,6 +217,7 @@ public class DiscSpinningController {
         //存入余额 钱
         userMoneyService.updateAmount(1, receive.getUserId(), receive.getNumber().doubleValue());
 
+
         if (receive.getNumber().compareTo(new BigDecimal("0.1")) > 0 && StringUtils.isNotBlank(userInfo.getZhiFuBao()) && StringUtils.isNotBlank(userInfo.getZhiFuBaoName())) {
             //提现
             withdraw(userInfo, receive.getNumber().doubleValue());

src/main/java/com/sqx/modules/job/task/CashOutTask.java

@@ -43,6 +43,7 @@ public class CashOutTask implements ITask {
             if (baseResp.getStatus() != null && baseResp.getStatus().equals(2)) {
                 cashOut.setState(1);
             } else {
+                cashOut.setState(2);
                 cashOut.setRefund(StringUtils.isNotBlank(baseResp.getMsg()) ? baseResp.getMsg() : baseResp.getErrorMsg());
 
                 UserMoneyDetails userMoneyDetails = new UserMoneyDetails(

src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java

@@ -127,7 +127,7 @@ public class WuyouController {
             if ("2".equals(notifyDto.getStatus())) {
                 cashOut.setState(1);
                 cashOut.setOutAt(DateUtil.now());
-            } else {
+            } else if(!cashOut.getState().equals(2)){
                 cashOut.setState(2);
                 cashOut.setRefund(notifyDto.getMsg());
 
@@ -137,6 +137,8 @@ public class WuyouController {
                 //存入余额 钱
                 userMoneyService.updateAmount(1, cashOut.getUserId(), Double.parseDouble(cashOut.getMoney()));
                 userMoneyDetailsService.save(userMoneyDetails);
+            }else{
+                return "success";
             }
             cashOutDao.updateById(cashOut);
         }