edit inmoney

src/main/java/com/xc/controller/protol/UserRechargeController.java

@@ -41,10 +41,10 @@ public class UserRechargeController {
     //账户线下充值转账 创建充值订单
     @RequestMapping({"inMoney.do"})
     @ResponseBody
-    public ServerResponse inMoney(String amtRMB, String amt, String payType, HttpServletRequest request) {
+    public ServerResponse inMoney(String amtRMB, String amt, String payType,String orderDesc, HttpServletRequest request) {
         User user = this.iUserService.getCurrentRefreshUser(request);
         messageService.sendTopicMessage(String.format("%s充值了%s", user.getRealName(), amt));
-        return this.iUserRechargeService.inMoney(amtRMB, amt, payType, request);
+        return this.iUserRechargeService.inMoney(amtRMB, amt, payType,orderDesc , request);
     }
 }
 

src/main/java/com/xc/service/IUserRechargeService.java

@@ -10,30 +10,30 @@ import javax.servlet.http.HttpServletRequest;
 
 public interface IUserRechargeService {
   ServerResponse checkInMoney(int paramInt, Integer paramInteger);
-  
-  ServerResponse inMoney(String amtRMB, String paramString1, String paramString2, HttpServletRequest paramHttpServletRequest);
-  
+
+  ServerResponse inMoney(String amtRMB, String paramString1, String paramString2, String orderDesc ,HttpServletRequest paramHttpServletRequest);
+
   ServerResponse findUserRechargeByOrderSn(String paramString);
-  
+
   ServerResponse chargeSuccess(UserRecharge paramUserRecharge) throws Exception;
-  
+
   ServerResponse chargeFail(UserRecharge paramUserRecharge) throws Exception;
-  
+
   ServerResponse chargeCancel(UserRecharge paramUserRecharge) throws Exception;
-  
+
   ServerResponse<PageInfo> findUserChargeList(String paramString1, String paramString2, HttpServletRequest paramHttpServletRequest, int paramInt1, int paramInt2);
-  
+
   ServerResponse<PageInfo> listByAgent(Integer paramInteger1, String paramString1, String paramString2, Integer paramInteger2, HttpServletRequest paramHttpServletRequest, int paramInt1, int paramInt2);
-  
+
   ServerResponse listByAdmin(Integer paramInteger1, Integer paramInteger2, String paramString1, Integer paramInteger3, String paramString2, String paramString3, HttpServletRequest paramHttpServletRequest, int paramInt1, int paramInt2);
-  
+
   ServerResponse updateState(Integer paramInteger1, Integer paramInteger2) throws Exception;
-  
+
   ServerResponse createOrder(Integer paramInteger1, Integer paramInteger2, Integer paramInteger3, String paramString);
-  
+
   ServerResponse del(Integer paramInteger);
-  
+
   int deleteByUserId(Integer paramInteger);
-  
+
   BigDecimal CountChargeSumAmt(Integer paramInteger);
 }

src/main/java/com/xc/service/impl/StockServiceImpl.java

@@ -104,9 +104,9 @@ public class StockServiceImpl implements IStockService {
         List<Stock> stockList = null;
         PageHelper.startPage(pageNum, pageSize);
         if (num == 1) {
-            stockList = this.stockMapper.findStockListByKeyWords2(keyWords, stockType, Integer.valueOf(0));
+            stockList = this.stockMapper.findStockListByKeyWords2(keyWords, stockType, 0);
         } else {
-            stockList = this.stockMapper.findStockListByKeyWords(keyWords, stockPlate, stockType, Integer.valueOf(0));
+            stockList = this.stockMapper.findStockListByKeyWords(keyWords, stockPlate, stockType, 0);
         }
         List<IndexInfo> indexInfoList = stockMapper.selectStockList();
         Map<String, StockIndexDF> indexMap = new HashMap<>();

src/main/java/com/xc/service/impl/UserRechargeServiceImpl.java

@@ -75,7 +75,7 @@ public class UserRechargeServiceImpl implements IUserRechargeService {
     }
 
 
-    public ServerResponse inMoney(String amtRMB, String amt, String payType, HttpServletRequest request) {
+    public ServerResponse inMoney(String amtRMB, String amt, String payType,String orderDesc, HttpServletRequest request) {
         if (StringUtils.isBlank(amtRMB) || StringUtils.isBlank(amt) || StringUtils.isBlank(payType)) {
             return ServerResponse.createByErrorMsg("参数不能为空");
         }
@@ -114,9 +114,10 @@ public class UserRechargeServiceImpl implements IUserRechargeService {
         userRecharge.setPayChannel(payType);
         userRecharge.setPayAmtRMB(new BigDecimal(amtRMB));
         userRecharge.setPayAmt(new BigDecimal(amt));
-        userRecharge.setOrderStatus(Integer.valueOf(0));
+        userRecharge.setOrderStatus(0);
         userRecharge.setAddTime(new Date());
-
+        //商家名称
+        userRecharge.setOrderDesc(orderDesc);
 //        BigDecimal payAmt = new BigDecimal(amt);
         // 账户充值
         //汇率
@@ -126,23 +127,15 @@ public class UserRechargeServiceImpl implements IUserRechargeService {
 //        }else {
 //            userRecharge.setPayAmt(new BigDecimal(amt));
 //        }
-
-
         int insertCount = this.userRechargeMapper.insert(userRecharge);
         if (insertCount > 0) {
-
             String email_token = KeyUtils.getUniqueKey();
-
             String redisSetExResult = RedisShardedPoolUtils.setEx(email_token, email_token, 300);
-
             log.info("用户充值，保存redis token成功，redisSetExResult = {}", redisSetExResult);
-
-            SendHTMLMail.send(user, userRecharge, email_token, siteInfo
-                    .getSiteHost(), siteInfo.getSiteEmailTo());
-            log.info("用户充值，发送审核邮件成功");
-
+//            SendHTMLMail.send(user, userRecharge, email_token, siteInfo
+//                    .getSiteHost(), siteInfo.getSiteEmailTo());
+//            log.info("用户充值，发送审核邮件成功");
             messageService.sendTopicMessage(String.format("%s充值了%s", user.getRealName(), amt));
-
             return ServerResponse.createBySuccessMsg("创建支付订单成功！");
         }
         return ServerResponse.createByErrorMsg("创建支付订单失败");
@@ -243,14 +236,9 @@ public class UserRechargeServiceImpl implements IUserRechargeService {
 
     public ServerResponse<PageInfo> findUserChargeList(String payChannel, String orderStatus, HttpServletRequest request, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-
         User user = this.iUserService.getCurrentUser(request);
-
-
         List<UserRecharge> userRecharges = this.userRechargeMapper.findUserChargeList(user.getId(), payChannel, orderStatus);
-
         PageInfo pageInfo = new PageInfo(userRecharges);
-
         return ServerResponse.createBySuccess(pageInfo);
     }
 

src/main/java/com/xc/service/impl/UserWithdrawServiceImpl.java

@@ -198,85 +198,42 @@ public class UserWithdrawServiceImpl implements IUserWithdrawService {
 
 
     public ServerResponse<PageInfo> findUserWithList(String withStatus, HttpServletRequest request, int pageNum, int pageSize) {
-
         PageHelper.startPage(pageNum, pageSize);
-
-
         User user = this.iUserService.getCurrentUser(request);
-
-
         List<UserWithdraw> userWithdraws = this.userWithdrawMapper.findUserWithList(user.getId(), withStatus);
-
-
         PageInfo pageInfo = new PageInfo(userWithdraws);
-
-
         return ServerResponse.createBySuccess(pageInfo);
-
     }
 
 
     public ServerResponse userCancel(Integer withId) {
-
         if (withId == null) {
-
             return ServerResponse.createByErrorMsg("id不能为空");
-
         }
-
-
         UserWithdraw userWithdraw = this.userWithdrawMapper.selectByPrimaryKey(withId);
-
         if (userWithdraw == null) {
-
             return ServerResponse.createByErrorMsg("订单不存在");
-
         }
-
-
         if (0 != userWithdraw.getWithStatus().intValue()) {
-
             return ServerResponse.createByErrorMsg("当前订单不能取消");
-
         }
-
-
         userWithdraw.setWithStatus(Integer.valueOf(3));
-
         userWithdraw.setWithMsg("用户取消出金");
-
         int updateCount = this.userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
-
         if (updateCount > 0) {
-
             log.info("修改用户提现订单 {} 状态成功", withId);
-
-
             User user = this.userMapper.selectByPrimaryKey(userWithdraw.getUserId());
-
             user.setUserAmt(user.getUserAmt().add(userWithdraw.getWithAmt()));
-
             user.setEnableAmt(user.getEnableAmt().add(userWithdraw.getWithAmt()));
-
             int updateUserCount = this.userMapper.updateByPrimaryKeySelective(user);
-
             if (updateUserCount > 0) {
-
                 log.info("反还用户资金，总 {} 可用 {}", user.getUserAmt(), user.getEnableAmt());
-
                 return ServerResponse.createBySuccessMsg("取消成功");
-
             }
-
             return ServerResponse.createByErrorMsg("取消失败");
-
         }
-
-
         log.info("修改用户提现订单 {} 状态失败", withId);
-
         return ServerResponse.createByErrorMsg("取消失败");
-
     }
 
 

src/main/resources/logback.xml

@@ -6,8 +6,8 @@
     <!--export CATALINA_HOME=/xiongcan/tomcat1-->
     <!--source /etc/profile-->
 
-    <property name="project_name" value="stock2c1"></property>
-    <property name="LOG_HOME" value="${CATALINA_HOME}/logs"></property>
+    <property name="project_name" value="stock2coin"/>
+    <property name="LOG_HOME" value="${CATALINA_HOME}/logs"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoding>UTF-8</encoding>
@@ -29,6 +29,10 @@
         <encoder>
             <pattern>[%d{HH:mm:ss.SSS}][%p][%c{40}][%t] %m%n</pattern>
         </encoder>
+        <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <!--超过10MB告知时间清除策略可以执行（也可以设置为1KB）-->
+            <maxFileSize>10MB</maxFileSize>
+        </timeBasedFileNamingAndTriggeringPolicy>
     </appender>
 
     <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -48,6 +52,10 @@
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
+        <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <!--超过10MB告知时间清除策略可以执行（也可以设置为1KB）-->
+            <maxFileSize>10MB</maxFileSize>
+        </timeBasedFileNamingAndTriggeringPolicy>
     </appender>
 
     <logger name="com.xc" additivity="false" level="INFO" >
@@ -58,19 +66,19 @@
 
     <!-- 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="INFO">