njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java

@@ -79,11 +79,6 @@ public class MoneyChangeDetailEntity {
      */
     private MoneyChangeCategory moneyChangeCategory;
 
-    /**
-     * 附件地址
-     */
-    private String fileUrl;
-
     /**
      * 扩展信息
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/service/MoneyAccountService.java

@@ -22,7 +22,6 @@ import java.util.List;
 
 /**
  * 资金账户表
- * @author ljw
  */
 @Slf4j
 @Service
@@ -55,10 +54,8 @@ public class MoneyAccountService extends ServiceImpl<MoneyAccountMapper, MoneyAc
         MoneyChangeDetailEntity changeDetail = new MoneyChangeDetailEntity()
                 .setMoneyAccountId(moneyAccountEntity.getId())
                 .setOldMoney(result.getMoney())
-                // 充值
+                .setDelta(moneyAccountEntity.getRechargeMoney()) // 充值
-                .setDelta(moneyAccountEntity.getRechargeMoney())
                 .setMoneyChangeCategory(MoneyChangeCategory.ChongZhi)
-                .setFileUrl(moneyAccountEntity.getFileUrl())
                 .setMemo("账户充值");
 
         moneyAccountEntity.setMoney(result.getMoney().add(moneyAccountEntity.getRechargeMoney()));

njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/WeChatPayServiceImpl.java

@@ -42,7 +42,6 @@ public class WeChatPayServiceImpl implements WeChatPayService {
      * @return 订单查询结果
      * @throws WxPayException 微信支付异常
      */
-    @Override
     public WxPayOrderQueryResult queryOrder(String outTradeNo) throws WxPayException {
         try {
             log.info("开始查询微信支付订单，商户订单号：{}", outTradeNo);
@@ -59,7 +58,6 @@ public class WeChatPayServiceImpl implements WeChatPayService {
      * @param outTradeNo 商户订单号
      * @throws WxPayException 微信支付异常
      */
-    @Override
     public void closeOrder(String outTradeNo) throws WxPayException {
         try {
             log.info("开始关闭微信支付订单，商户订单号：{}", outTradeNo);
@@ -82,7 +80,6 @@ public class WeChatPayServiceImpl implements WeChatPayService {
      * @return 退款结果
      * @throws WxPayException 微信支付异常
      */
-    @Override
     public String refund(String outTradeNo, String outRefundNo, int totalFee, int refundFee, String notifyUrl) throws WxPayException {
         try {
             log.info("开始申请微信支付退款，商户订单号：{}，退款单号：{}，退款金额：{}，退款回调地址：{}", outTradeNo,

njzscloud-svr/src/main/resources/application-dev.yml

@@ -30,7 +30,6 @@ spring:
       - /order_info/gps_test
       - /wechatTemplateMessage/key
       - /hsoa/push_order
-      - /operationManual/appShow
 app:
   default-place:
     province: 340000

njzscloud-svr/src/main/resources/application-prod.yml

@@ -28,7 +28,6 @@ spring:
       - /biz_audit_config/copy
       - /wechatTemplateMessage/key
       - /hsoa/push_order
-      - /operationManual/appShow
 
 app:
   in-out-gap: 180

njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml

@@ -14,7 +14,6 @@
         mcd.delta,
         mcd.new_money,
         mcd.money_change_category,
-        mcd.file_url,
         mcd.extend_info,
         mcd.memo,
         mcd.company_id,

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -325,25 +325,26 @@
         WHERE user_id = #{userId}
     </select>
     <select id="paymentContext" resultType="com.njzscloud.supervisory.order.pojo.result.PaymentContextResult">
-        SELECT a.id               AS orderId,
+        SELECT
-               a.trans_company_id AS transCompanyId,
+            a.id AS orderId,
-               a.sn,
+            a.trans_company_id AS transCompanyId,
-               a.settlement_way   AS oi_pay_way,
+            a.sn,
-               a.out_trade_no,
+            a.settlement_way as oi_pay_way,
-               bc.user_id         AS companyUserId,
+            a.out_trade_no,
-               ma1.id             AS companyAccountId,
+            bc.user_id AS companyUserId,
-               ma1.money          AS companyBalance,
+            ma1.id AS companyAccountId,
-               ma1.revenue,
+            ma1.money AS companyBalance,
-               bc.settlement_way,
+            ma1.revenue,
-               sua.wechat_openid,
+            bc.settlement_way,
-               a.refund_money,
+            sua.wechat_openid,
-               a.settle_money,
+            a.refund_money,
-               bd.user_id         AS driver_user_id
+            a.settle_money,
+            bd.user_id AS driver_user_id
         FROM order_info a
-                 LEFT JOIN biz_company bc ON bc.id = a.trans_company_id
+             LEFT JOIN biz_company bc ON bc.id = a.trans_company_id
-                 LEFT JOIN money_account ma1 ON ma1.station_id = a.trans_company_id
+             LEFT JOIN money_account ma1 ON ma1.station_id = a.trans_company_id
-                 LEFT JOIN biz_driver bd ON a.driver_id = bd.id
+             LEFT JOIN biz_driver bd ON a.driver_id = bd.id
-                 LEFT JOIN sys_user_account sua ON bd.user_id = sua.user_id
+             LEFT JOIN sys_user_account sua ON bd.user_id = sua.user_id
         WHERE a.id = #{orderId}
     </select>
     <select id="getTruckInfo" resultType="com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity">
@@ -358,19 +359,18 @@
     </select>
     <select id="gpsLastOnlineTime"
             resultType="com.njzscloud.supervisory.device.pojo.entity.DeviceLocalizerEntity">
-        SELECT *
+        select *
-        FROM device_localizer
+        from device_localizer
-        WHERE terminal_id = #{gpsId}
+        where terminal_id = #{gpsId}
-          AND deleted = 0
+          and deleted = 0
     </select>
     <select id="getRoute" resultType="java.lang.String">
         SELECT b.name route_name
         FROM order_route a
-                 INNER JOIN order_route_detail b ON a.id = b.order_route_id AND b.deleted = 0
+                 INNER JOIN order_route_detail b ON a.id = b.order_route_id
         WHERE a.order_id = #{id}
           AND b.name IS NOT NULL
           AND TRIM(b.name) != ''
-          AND a.deleted = 0
         ORDER BY b.sort, b.create_time, b.id
     </select>
 </mapper>