更新

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/hxz/HxzService.java

@@ -101,7 +101,6 @@ public class HxzService extends SuperService {
         // 构建返回结果
         resultModel = expenseFlowService.buildPayResult(expenseFlow.getOrderNo());
         requestInfoService.addRequestInfo(param, resultModel);
-        log.info("1111111111111111111111111");
         return ResultContent.buildSuccess(JSONUtil.toJsonStr(resultModel));
     }
 
@@ -112,12 +111,10 @@ public class HxzService extends SuperService {
      * @return
      */
     public ResultContent orderQuery(OrderQueryModel param) {
-        ConsumTransactionsFullResult result = new ConsumTransactionsFullResult();
         // 构建返回结果
         ConsumTransactionsResult resultModel = expenseFlowService.buildPayResult(param.getOrder());
-        result.setModel(resultModel);
         requestInfoService.addRequestInfo(param, resultModel);
-        return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
+        return ResultContent.buildSuccess(JSONUtil.toJsonStr(resultModel));
     }
 
     /**
@@ -128,16 +125,12 @@ public class HxzService extends SuperService {
      */
     public ResultContent qRCodeTransaction(QRCodeTransactionModel param) {
         //  返回参数
-        QRCodeTransactionFullResult result = new QRCodeTransactionFullResult();
-        result.setPaymentType(param.getPaymentType());
-
         QRCodeTransactionResult model = new QRCodeTransactionResult();
         String mqttDataId = param.getMqttDataId();
         ExpenseFlow expenseFlow = expenseFlowService.init(mqttDataId);
         if (ObjectUtils.isEmpty(expenseFlow)) {
             model.setFailed("重复订单");
-            result.setModel(model);
-            return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
+            return ResultContent.buildSuccess(JSONUtil.toJsonStr(model));
         }
 
         // 创建订单
@@ -163,10 +156,9 @@ public class HxzService extends SuperService {
                 model.setQrorder(expenseFlow.getOrderNo());
             }
         }
-        result.setModel(model);
         // 记录日志
         requestInfoService.addRequestInfo(param, model);
-        return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
+        return ResultContent.buildSuccess(JSONUtil.toJsonStr(model));
     }
 
     /**
@@ -176,13 +168,10 @@ public class HxzService extends SuperService {
      * @return
      */
     public ResultContent transactionInquiry(TransactionInquiryModel param) {
-        ConsumTransactionsFullResult result = new ConsumTransactionsFullResult();
-        result.setPaymentType(PaymentType.WxQrCode);
         // 构建返回结果
         ConsumTransactionsResult resultModel = expenseFlowService.buildPayResult(param.getQROrder());
-        result.setModel(resultModel);
         requestInfoService.addRequestInfo(param, resultModel);
-        return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
+        return ResultContent.buildSuccess(JSONUtil.toJsonStr(resultModel));
     }
 
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -186,38 +186,6 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             entity.setIsPaySuccess(Boolean.FALSE);
             entity.setPayRemark(content.getMsg());
         }
-
-//        Wallet wallet = walletDao.findByUserId(entity.getUserId());
-//        BigDecimal amount = entity.getPayAmount();
-//        UserAccount userAccount = entity.getUserAccount();
-//        // 扣款
-//        // 消费金额
-//        try {
-//            WalletRecharge walletRecharge = new WalletRecharge();
-//            initEntityNoCheckOid(walletRecharge);
-//            BigDecimal preAmount = wallet.getAmount();
-//            BigDecimal afterAmount = preAmount.subtract(amount);
-//            wallet.setAmount(afterAmount);
-//
-//            walletRecharge.setPaymentNo(entity.getPaymentNo());
-//            walletRecharge.setPreAmount(preAmount);
-//            walletRecharge.setAmount(amount);
-//            walletRecharge.setRechargeType(RechargeType.Expend);
-//            walletRecharge.setAfterAmount(afterAmount);
-//            walletRecharge.setUserId(userAccount.getUserId());
-//            walletRecharge.setUserAccount(userAccount);
-//            walletRecharge.setWallet(wallet);
-//            walletRecharge.setUserName(userAccount.getName());
-//            walletRecharge.setPhone(userAccount.getPhone());
-//            walletRecharge.setYear(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyy));
-//            walletRecharge.setMonth(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternMM));
-//            walletRecharge.setTimeStr(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyySSS));
-//
-//            walletDao.save(wallet);
-//            walletRechargeDao.save(walletRecharge);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
         expenseFlowDao.save(entity);
         return ResultContent.buildSuccess();
     }
@@ -489,7 +457,8 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
                 result.setAmount(CommonUtil.turnMoney2Show(expenseFlow.getPayAmount()));
 
                 if (expenseFlow.getPaymentType() == PaymentType.UserWallet) {
-                    com.zhongshu.payment.client.ret.ResultContent<WalletModel> content = walletFeignService.getWallet(expenseFlow.getProjectOid(), WalletType.User, null, expenseFlow.getUserId());
+                    com.zhongshu.payment.client.ret.ResultContent<WalletModel> content = walletFeignService.getWallet(
+                            expenseFlow.getProjectOid(), WalletType.User, "", expenseFlow.getUserId());
                     if (content.isSuccess()) {
                         WalletModel walletModel = content.getContent();
                         if (ObjectUtils.isNotEmpty(walletModel)) {