liuchaojie 4 rokov pred
rodič
commit
94ac61cce3

+ 0 - 3
src/main/java/com/xc/service/impl/UserRechargeServiceImpl.java

@@ -298,16 +298,13 @@ public class UserRechargeServiceImpl implements IUserRechargeService {
     @Transactional
     public ServerResponse updateState(Integer chargeId, Integer state) throws Exception {
         UserRecharge userRecharge = this.userRechargeMapper.selectByPrimaryKey(chargeId);
-
         if (userRecharge == null) {
             return ServerResponse.createByErrorMsg("充币订单不存在");
         }
         if (userRecharge.getOrderStatus().intValue() != 0) {
             return ServerResponse.createByErrorMsg("订单状态不是下单状态不能更改");
         }
-
         if (state.intValue() == 1) {
-
             User user = this.userMapper.selectByPrimaryKey(userRecharge.getUserId());
             if (user == null) {
                 return ServerResponse.createByErrorMsg("用户不存在");

+ 1 - 1
src/main/java/com/xc/utils/task/index/EntrustTask.java

@@ -43,7 +43,7 @@ public class EntrustTask {
     DbStockService dbStockService;
 
     // 星期一到星期五的每天9点到15点触发 每3分钟触发一次
-//    @Scheduled(cron = "*/3 * * * * ?")
+    @Scheduled(cron = "*/3 * * * * ?")
     public void toEntrust() {
         boolean am = true;
         boolean pm = true;

+ 2 - 1
src/main/java/com/xc/utils/task/index/ForceSellTask.java

@@ -7,6 +7,7 @@ import com.xc.utils.thread.ThreadUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -19,7 +20,7 @@ public class ForceSellTask {
 
     /*用户持仓单定时*/
 //    @Scheduled(cron = "0 0/3 9-23 ? * MON-FRI")
-//    @Scheduled(cron = "*/3 * * * * ?")
+    @Scheduled(cron = "*/3 * * * * ?")
     public void banlanceUserPositionTaskV1() {
         boolean am = true;
         boolean pm = true;

+ 1 - 1
src/main/java/com/xc/utils/task/index/StopProfitTargetTask.java

@@ -30,7 +30,7 @@ public class StopProfitTargetTask {
 
     // 星期一到星期五的每天9点到15点触发 每3分钟触发一次
 //    @Scheduled(cron = "0 0/3 9-23 ? * MON-FRI")
-//    @Scheduled(cron = "*/3 * * * * ?")
+    @Scheduled(cron = "*/3 * * * * ?")
     public void toEntrust() {
         boolean am = true;
         boolean pm = true;

+ 2 - 2
src/main/java/mappers/UserRechargeMapper.xml

@@ -38,7 +38,7 @@
     insert into user_recharge (id, user_id, nick_name,
       agent_id, order_sn, pay_sn,
       pay_channel, pay_amt, order_status,
-      order_desc, add_time, pay_time, pay_amt_rMB ,agent_name
+      order_desc, add_time, pay_time, pay_amt_rMB ,agent_name, phone
       )
     values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{nickName,jdbcType=VARCHAR},
       #{agentId,jdbcType=INTEGER}, #{orderSn,jdbcType=VARCHAR}, #{paySn,jdbcType=VARCHAR},
@@ -172,7 +172,7 @@
         pay_amt_rMB = #{payAmtRMB,jdbcType=DECIMAL},
       </if>
       <if test="agentName != null" >
-        agen_name = #{agentName,jdbcType=VARCHAR},
+        agent_name = #{agentName,jdbcType=VARCHAR},
       </if>
       <if test="phone != null" >
         phone = #{phone,jdbcType=VARCHAR},

+ 2 - 2
src/main/java/mappers/UserWithdrawMapper.xml

@@ -42,7 +42,7 @@
       agent_id, with_amt, apply_time,
       trans_time, with_name, bank_no,
       bank_name, bank_address, with_status,
-      with_fee, with_msg, with_amt_rMB, with_fee_rMB)
+      with_fee, with_msg, with_amt_rMB, with_fee_rMB ,agent_name, phone)
     values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{nickName,jdbcType=VARCHAR},
       #{agentId,jdbcType=INTEGER}, #{withAmt,jdbcType=DECIMAL}, #{applyTime,jdbcType=TIMESTAMP},
       #{transTime,jdbcType=TIMESTAMP}, #{withName,jdbcType=VARCHAR}, #{bankNo,jdbcType=VARCHAR},
@@ -202,7 +202,7 @@
         with_fee_rMB = #{withFeeRMB,jdbcType=DECIMAL},
       </if>
       <if test="agentName != null" >
-        agen_name = #{agentName,jdbcType=VARCHAR},
+        agent_name = #{agentName,jdbcType=VARCHAR},
       </if>
       <if test="phone != null" >
         phone = #{phone,jdbcType=VARCHAR},

+ 14 - 14
src/main/resources/logback.xml

@@ -66,22 +66,22 @@
 
     <!-- geelynote mybatis log 日志 -->
 
-    <logger name="com.xc.dao" level="DEBUG"/>
-    <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG" >
-        <appender-ref ref="console"/>
-    </logger>
-    <logger name="java.sql.Connection" level="DEBUG">
-        <appender-ref ref="console"/>
-    </logger>
-    <logger name="java.sql.Statement" level="DEBUG">
-        <appender-ref ref="console"/>
-    </logger>
-    <logger name="java.sql.PreparedStatement" level="DEBUG">
-        <appender-ref ref="console"/>
-    </logger>
+<!--    <logger name="com.xc.dao" level="DEBUG"/>-->
+<!--    <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG" >-->
+<!--        <appender-ref ref="console"/>-->
+<!--    </logger>-->
+<!--    <logger name="java.sql.Connection" level="DEBUG">-->
+<!--        <appender-ref ref="console"/>-->
+<!--    </logger>-->
+<!--    <logger name="java.sql.Statement" level="DEBUG">-->
+<!--        <appender-ref ref="console"/>-->
+<!--    </logger>-->
+<!--    <logger name="java.sql.PreparedStatement" level="DEBUG">-->
+<!--        <appender-ref ref="console"/>-->
+<!--    </logger>-->
 
     <!--这里设置成DEBUG显示日志-->
-    <root level="DEBUG">
+    <root level="INFO">
         <appender-ref ref="console"/>
         <appender-ref ref="error"/>
     </root>