10-21 收款：地区权限修改（地方财务）

src/main/java/com/example/demo/domain/entity/CashRecord.java

@@ -56,6 +56,7 @@ public class CashRecord implements Serializable {
     // 状态 & 操作人
     private Integer status;                // 订单状态
     private Integer submitterId;           // 提交人 id
+    private String submitterMarket;        //提交人地区
     private String voucher;                // 转账凭证
     private String remark;                 // 备注
     private String rejectReason;           // 驳回理由

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

@@ -54,6 +54,7 @@ public class CashCollection implements Serializable {
     //状态  操作人
     private Integer status;             // 订单状态
     private Integer submitterId;        // 提交人 id
+    private String submitterMarket;     //提交人地区
     private String submitterName;        // 提交人 姓名
     private String voucher;             // 转账凭证
     private String remark;              // 备注

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

@@ -102,6 +102,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         cashRecord.setRemark(cashCollection.getRemark());       //备注
         cashRecord.setStatus(0);    //订单状态：付款线下财务待审核
         cashRecord.setSubmitterId(cashCollection.getSubmitterId()); //提交人ID
+        cashRecord.setSubmitterMarket(cashCollection.getSubmitterMarket());
         cashRecord.setOrderType(1);     //订单类型：1-收款
         cashRecord.setMarket(cashCollection.getMarket());
         //地区，根据jwcode插入
@@ -185,25 +186,31 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         if (markets.contains("9") || markets.contains("9999")){
             markets=null;
         }
-        cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket()));
+      //  cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket()));
         if (cashCollection.getCashRoleId()==2) {
             //角色是总部时，传1346，sql处理为（1，3，4，6）筛选，
 
             cashCollection.setStatus(1346);
             cashCollection.setSubmitterId(null);
             cashCollection.setReceivedMarket(null);
-        }if (cashCollection.getCashRoleId()==1){
+            cashCollection.setSubmitterMarket(null);
+        }
+        if (cashCollection.getCashRoleId()==1){
             //角色是地方财务，提交人置空不设筛选条件,仅按地区筛选，查看
 
-        if(cashCollection.getStatus()==null){
-            cashCollection.setStatus(123460);
-        }
+            if(cashCollection.getStatus()==null){
+            cashCollection.setStatus(123460);}
+            if (cashCollection.getStatus()==0||cashCollection.getStatus()==2){
+                cashCollection.setReceivedMarket(null);}
+            if (cashCollection.getStatus()==1||cashCollection.getStatus()==3){
+                cashCollection.setSubmitterMarket(null);}
             cashCollection.setSubmitterId(null);
-        }if (cashCollection.getCashRoleId()==0){
+
+        }
+        if (cashCollection.getCashRoleId()==0){
             //角色是地方财务，提交人置空不设筛选条件---仅当角色是0 地方客服时，按提交人筛选
             if(cashCollection.getStatus()==null){
-                cashCollection.setStatus(1234560);
-            }
+                cashCollection.setStatus(1234560);}
             cashCollection.setSubmitterId(cashCollection.getSubmitterId());
             cashCollection.setReceivedMarket(null);
         }

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -9,12 +9,12 @@
             cash_record(order_type,jwcode,name,market,activity,
                             order_code,goods_name,good_num,permanent_gold,free_gold,
                             payment_currency,payment_amount,received_market,
-                            pay_type,pay_time,status,submitter_id,
+                            pay_type,pay_time,status,submitter_id,submtter_market,
                             voucher,remark)
         values(#{orderType},#{jwcode},#{name},#{market},#{activity},
                #{orderCode},#{goodsName},#{goodNum},#{permanentGold},#{freeGold},#{paymentCurrency},
                #{paymentAmount},#{receivedMarket},#{payType},#{payTime},
-               #{status},#{submitterId},#{voucher},#{remark})
+               #{status},#{submitterId},#{submitterMarket},#{voucher},#{remark})
     </insert>
 <!--    <insert id="syncToCashRecord">
         insert into cash_record(order_type,jwcode,name,market,activity,
@@ -121,12 +121,10 @@
                m2.name as receivedMarket,
                cr.received_amount/100 as receivedAmount,cr.handling_charge/100 as handlingCharge,
                cr.pay_type,cr.pay_time,cr.received_time,
-               cr.status,cr.submitter_id,cr.voucher,cr.remark,cr.reject_reason,
+               cr.status,cr.submitter_id,cr.submitter_market,cr.voucher,cr.remark,cr.reject_reason,
                cr.audit_id,cr.create_time,cr.update_time,cr.audit_time,
                a1.admin_name as submitterName,
                a2.admin_name as auditName
-
-
         from cash_record cr
         left join admin a1 on cr.submitter_id = a1.id
         left join admin a2 on cr.audit_id = a2.id
@@ -148,9 +146,32 @@
         <if test="cashCollection.submitterId!=null and cashCollection.submitterId !=''">
             AND cr.submitter_id = #{cashCollection.submitterId}
         </if>
-        <if test="cashCollection.receivedMarket!=null and cashCollection.receivedMarket!=''">
-            AND cr.received_market = #{cashCollection.receivedMarket}
-        </if>
+            <!-- 其他原有条件不变 -->
+   <!--         <choose>
+                <when test="cashCollection.status != null and cashCollection.status == 4">
+                    <if test="cashCollection.receivedMarket != null and cashCollection.receivedMarket != ''">
+                        AND (cr.received_market = #{cashCollection.receivedMarket}
+                        <if test="cashCollection.submitterMarket != null and cashCollection.submitterMarket != ''">
+                            OR cr.submitter_market = #{cashCollection.submitterMarket}
+                        </if>
+                        )
+                    </if>
+                    <if test="(cashCollection.receivedMarket == null or cashCollection.receivedMarket == '')
+                     and cashCollection.submitterMarket != null and cashCollection.submitterMarket != ''">
+                        AND cr.submitter_market = #{cashCollection.submitterMarket}
+                    </if>
+                </when>
+
+                &lt;!&ndash; 非 status=4 保持原逻辑：同时满足 &ndash;&gt;
+                <otherwise>-->
+                    <if test="cashCollection.receivedMarket != null and cashCollection.receivedMarket != ''">
+                        AND cr.received_market = #{cashCollection.receivedMarket}
+                    </if>
+                    <if test="cashCollection.submitterMarket != null and cashCollection.submitterMarket != ''">
+                        AND cr.submitter_market = #{cashCollection.submitterMarket}
+                    </if>
+         <!--       </otherwise>
+            </choose>-->
         <if test="cashCollection.activity!=null and cashCollection.activity!=''">
             AND cr.activity like concat('%',#{cashCollection.activity},'%')
         </if>