Merge remote-tracking branch 'origin/test' into test

src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java

@@ -56,7 +56,6 @@ import weixin.popular.support.TokenManager;
 
 import javax.websocket.SendResult;
 import java.math.BigDecimal;
-import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -600,7 +599,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
             entity.setOrderNumber(outOrderNo);
         }
         // 执行提现操作
-        BaseResp baseResp = wuyouPay.extractOrder(entity.getOrderNumber(), entity.getMoney(), entity.getZhifubao(), entity.getZhifubaoName());
+        BaseResp baseResp = wuyouPay.extractOrderForAudit(entity.getOrderNumber(), entity.getMoney(), entity.getZhifubao(), entity.getZhifubaoName());
         if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) {
             entity.setState(1);
         } else if (StringUtils.isNotBlank(baseResp.getErrorMsg())) {

src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java

@@ -145,6 +145,35 @@ public class WuyouPay {
         return JSONObject.parseObject(body, BaseResp.class);
     }
 
+    /**
+     * 提现，人工审核使用，不收配置开关限制，直接提现
+     *
+     * @param account  支付宝账号
+     * @param userName 支付宝名称
+     */
+    public BaseResp extractOrderForAudit(String outOrderNo, String amount, String account, String userName) {
+        Map<String, Object> params = getBaseParams();
+
+        params.put("out_trade_no", outOrderNo);
+        params.put("total", amount);
+        params.put("bank_card", account);
+        params.put("bank_account_name", userName);
+        params.put("bank_name", "1");
+        params.put("bank_branch", "1");
+        params.put("province", "1");
+        params.put("city", "1");
+        params.put("notify_url", extractNotifyUrl);
+
+        String sign = Encrypt.getParamsSign(params);
+        params.put("sign", sign);
+
+        params.put("business_type", 0);
+        params.put("business_attr", "alipay");
+
+        String body = request(Constants.EXTRACT_URL, params, "");
+        return JSONObject.parseObject(body, BaseResp.class);
+    }
+
     public BaseResp queryExtractOrder(String outOrderNo, String amount) {
         Map<String, Object> params = getBaseParams();
         params.put("out_trade_no", outOrderNo);

src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java

@@ -81,7 +81,12 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
                 case 2:
                     //日任务
                     if (s.getNumber().equals(1)) {
-                        Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00");
+//                        Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00");
+                        InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(userId);
+                        Integer dayOrderNum = 0;
+                        if (inviteAchievement != null) {
+                            dayOrderNum = inviteAchievement.getCount();
+                        }
                         if (dayOrderNum < 3) {
                             s.setDiscNumber(dayOrderNum);
                             s.setNumber(3);
@@ -164,7 +169,12 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
                 //一次性任务
                 case 3:
                     if (s.getId().equals(1L)) {
-                        Integer sumOrderNum = ordersService.countOrderNum(userId, null);
+//                        Integer sumOrderNum = ordersService.countOrderNum(userId, null);
+                        InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(userId);
+                        Integer sumOrderNum = 0;
+                        if (inviteAchievement != null) {
+                            sumOrderNum = inviteAchievement.getCount();
+                        }
                         if (sumOrderNum != null && sumOrderNum < s.getNumber()) {
                             s.setDiscNumber(sumOrderNum);
                             s.setNumber(s.getNumber());

src/main/resources/application-prod.yml

@@ -37,26 +37,26 @@ spring:
                 idle-timeout: ${idle-timeout}
                 max-lifetime: ${max-lifetime}
                 connection-timeout: ${connection-timeout}
-            slave-0:
+#            slave-0:
-                driver-class-name: ${driver-class-name}
+#                driver-class-name: ${driver-class-name}
-                jdbc-url: jdbc:mysql://localhost:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
+#                jdbc-url: jdbc:mysql://localhost:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
-                username: root
+#                username: root
-                password: acddb0c84a192ada
+#                password: acddb0c84a192ada
-                minimum-idle: ${minimum-idle}
+#                minimum-idle: ${minimum-idle}
-                maximum-pool-size: ${maximum-pool-size}
+#                maximum-pool-size: ${maximum-pool-size}
-                idle-timeout: ${idle-timeout}
+#                idle-timeout: ${idle-timeout}
-                max-lifetime: ${max-lifetime}
+#                max-lifetime: ${max-lifetime}
-                connection-timeout: ${connection-timeout}
+#                connection-timeout: ${connection-timeout}
-            slave-1:
+#            slave-1:
-                driver-class-name: ${driver-class-name}
+#                driver-class-name: ${driver-class-name}
-                jdbc-url: jdbc:mysql://172.18.96.9:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
+#                jdbc-url: jdbc:mysql://172.18.96.9:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
-                username: root
+#                username: root
-                password: VideoUser1@
+#                password: VideoUser1@
-                minimum-idle: ${minimum-idle}
+#                minimum-idle: ${minimum-idle}
-                maximum-pool-size: ${maximum-pool-size}
+#                maximum-pool-size: ${maximum-pool-size}
-                idle-timeout: ${idle-timeout}
+#                idle-timeout: ${idle-timeout}
-                max-lifetime: ${max-lifetime}
+#                max-lifetime: ${max-lifetime}
-                connection-timeout: ${connection-timeout}
+#                connection-timeout: ${connection-timeout}
             slave-2:
                 driver-class-name: ${driver-class-name}
                 jdbc-url: jdbc:mysql://172.18.96.8:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
@@ -74,7 +74,8 @@ spring:
             #数据源
             duanju:
                 master-data-source-name: master-0
-                slave-data-source-names: slave-0,slave-1,slave-2
+#                slave-data-source-names: slave-0,slave-1,slave-2
+                slave-data-source-names: slave-2
 #                    - slave-0
 #                    - slave-1
 #                    - slave-2