修改用户流水、历史订单

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java

@@ -436,7 +436,7 @@ public class XhpcPileOrderController extends BaseController {
             R user = userTypeService.getUser(null, xhpcChargeOrder.getUserId(), source, null, tenantId);
             if(user !=null && user.getData() !=null){
                 Map<String, Object> userMessage = (Map<String, Object>)user.getData();
-                if (userMessage == null || userMessage.get("balance") == null) {
+                if (userMessage != null && userMessage.get("balance") != null) {
                     xhpcHistoryOrderService.addXhpcChargeOrder(userMessage,orderNo,1);
                 }
             }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java

@@ -877,7 +877,7 @@ public class XhpcHistoryOrderController extends BaseController {
                     R user = userTypeService.getUser(null, xhpcChargeOrder.getUserId(), source, null, tenantId);
                     if(user !=null && user.getData() !=null){
                         Map<String, Object> userMessage = (Map<String, Object>)user.getData();
-                        if (userMessage == null || userMessage.get("balance") == null) {
+                        if (userMessage != null && userMessage.get("balance") != null) {
                             xhpcHistoryOrderService.addXhpcChargeOrder(userMessage,xhpcChargeOrder.getSerialNumber(),2);
                         }
                     }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java

@@ -19,7 +19,7 @@ public interface IXhpcHistoryOrderService {
 
     /**
      * 用户历史订单表
-     * @param userId
+     * @param
      * @return
      */
     List<Map<String,Object>> list(HttpServletRequest request);

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java

@@ -87,7 +87,7 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
         R user = userTypeService.getUser(null, userid, userType, null, tenantId);
         if(user !=null && user.getData() !=null){
             Map<String, Object> userMessage = (Map<String, Object>)user.getData();
-            if (userMessage == null) {
+            if (userMessage != null) {
                 startPage();
                 return xhpcHistoryOrderMapper.list(userid,userType,tenantId);
             }

xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java

@@ -6,10 +6,13 @@ import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.utils.StringUtils;
 import com.xhpc.common.core.web.service.BaseService;
 import com.xhpc.common.security.service.TokenService;
+import com.xhpc.payment.controller.AlipayPaymentController;
 import com.xhpc.payment.domain.XhpcUserAccountStatement;
 import com.xhpc.payment.mapper.XhpcUserAccountStatementMapper;
 import com.xhpc.payment.service.IXhpcUserAccountStatementService;
 import com.xhpc.system.api.model.LoginUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,7 +39,7 @@ public class XhpcUserAccountStatementServiceImpl extends BaseService implements
     @Autowired
     private TokenService tokenService;
 
-
+    private static final Logger logger = LoggerFactory.getLogger(XhpcUserAccountStatementServiceImpl.class);
     /**
      * 新增 用户流水
      *
@@ -51,7 +54,7 @@ public class XhpcUserAccountStatementServiceImpl extends BaseService implements
     /**
      * 用户流水分页列表
      *
-     * @param appUserId C端用户id
+     * @param  C端用户id
      * @return
      */
     @Override
@@ -64,13 +67,12 @@ public class XhpcUserAccountStatementServiceImpl extends BaseService implements
         R user = userTypeService.getUser(null, userid, userType, null, tenantId);
         if(user !=null && user.getData() !=null){
             Map<String, Object> userMessage = (Map<String, Object>)user.getData();
-            if (userMessage == null) {
+            if (userMessage != null) {
                 startPage();
                 return xhpcUserAccountStatementMapper.page(userid,userType,tenantId);
             }
         }
         return list;
-        //return xhpcUserAccountStatementMapper.page(appUserId);
     }
 
     /**
@@ -115,7 +117,7 @@ public class XhpcUserAccountStatementServiceImpl extends BaseService implements
     /**
      * 用户流水列表
      *
-     * @param appUserId C端用户id
+     * @param  C端用户id
      * @return
      */
     @Override
@@ -129,7 +131,7 @@ public class XhpcUserAccountStatementServiceImpl extends BaseService implements
         R user = userTypeService.getUser(null, userid, userType, null, tenantId);
         if(user !=null && user.getData() !=null){
             Map<String, Object> userMessage = (Map<String, Object>)user.getData();
-            if (userMessage == null) {
+            if (userMessage != null) {
                 return xhpcUserAccountStatementMapper.list(userid,userType,tenantId);
             }
         }

xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml

@@ -188,10 +188,10 @@
             and xau.app_user_id = #{appUserId}
         </if>
         <if test="tenantId != null and tenantId != ''">
-            and xau.tenant_id = #{tenantId}
+            and xuas.tenant_id = #{tenantId}
         </if>
         <if test="source!= null">
-            and xau.source = #{source}
+            and xuas.source = #{source}
         </if>
         ORDER BY xuas.create_time DESC
     </select>