10-17 收款筛选：用户地区展示优化

src/main/java/com/example/demo/domain/vo/cash/CashCollection.java

@@ -30,6 +30,7 @@ public class CashCollection implements Serializable {
     private Integer jwcode;             // 精网号
     private String name;                // 姓名
     private String market;              // 所属地区
+    private String marketName;          // 所属地区名称
     private String activity;            // 活动名称
     private String orderCode;           // 金币订单号
     private String bankCode;            // 银行流水订单号

src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java

@@ -63,7 +63,14 @@ public class CashAuditServiceImpl implements CashAuditService {
                 rechargeOrder.setFreeJune(order.getFreeGold());
                 rechargeOrder.setFreeDecember(0);
             }
-            rechargeOrder.setSumGold(order.getPermanentGold());
+            rechargeOrder.setSumGold(order.getPermanentGold()+order.getFreeGold());
+            //todo 缺汇率id、money、备注 10-17 11：30
+            rechargeOrder.setPayModel(order.getPayType());
+            rechargeOrder.setVoucher(order.getVoucher());
+            rechargeOrder.setPayPlatform("金币系统");
+
+
+
         }
         else if (action==2){ //驳回
             updateOrder.setStatus(2);

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -176,11 +176,12 @@ public class CashCollectionServiceImpl implements CashCollectionService {
             markets=null;
         }
         cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket()));
-        if (cashCollection.getCashRoleId()==2)
-        {
+        if (cashCollection.getCashRoleId()==2) {
+            //角色是总部时，传134，sql处理为（1，3，4）筛选，提交人置空不设筛选条件
             cashCollection.setStatus(134);
             cashCollection.setSubmitterId(null);
         }if (cashCollection.getCashRoleId()==1){
+            //角色是地方财务，提交人置空不设筛选条件---仅当角色是0 地方客服时，按提交人筛选
             cashCollection.setSubmitterId(null);
         }
         cashCollection.setMarkets(markets);

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -70,7 +70,8 @@
     </select>
     <!--多条件查询收款订单列表-->
     <select id="selectCollection1" resultType="com.example.demo.domain.vo.cash.CashCollection">
-        select cr.id,cr.jwcode,cr.name,cr.market,cr.activity,cr.order_code,cr.bank_code,
+        select cr.id,cr.jwcode,cr.name,cr.market,
+               m.name as marketName,cr.activity,cr.order_code,cr.bank_code,
                cr.goods_name,cr.good_num,cr.payment_currency,cr.payment_amount,
                cr.received_currency,cr.received_amount,cr.handling_charge,
                cr.received_market,cr.pay_type,cr.pay_time,cr.received_time,
@@ -82,6 +83,7 @@
         from cash_record cr
         left join admin a1 on cr.submitter_id = a1.id
         left join admin a2 on cr.audit_id = a2.id
+        left join market m on m.id = cr.market
         <where>
             1 = 1
             <if test="cashCollection.market != null and cashCollection.market != ''">