10-16 收款查询角色权限

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

@@ -61,6 +61,7 @@ public class CashRecord implements Serializable {
     private String rejectReason;           // 驳回理由
     private Integer auditId;             //审核人Id
     private String receivedRemark;          // 到账备注
+    private Integer cashRoleId;         //角色id(0客服，1地区财务/负责人，2总部)
 
     // 退款专用字段
     private String refundReason;           // 退款原因（客服填写）

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

@@ -59,7 +59,8 @@ public class CashCollection implements Serializable {
     private String receivedRemark;      //到账备注
     private String rejectReason;        // 驳回理由
     private String auditId;             //审核人id
-    private String auditName;             //审核人id
+    private String auditName;           //审核人id
+    private Integer cashRoleId;         //角色id(0客服，1地区财务/负责人，2总部)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private LocalDateTime createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")

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

@@ -33,7 +33,8 @@ public class CashAuditServiceImpl implements CashAuditService {
     public boolean auditCollection(String token,Integer auditId, String orderCode, Integer action, String rejectReason) {
         CashRecord order = cashCollectionMapper.selectUnAuditByOrderCode(orderCode);
 
-        if (order==null || order.getStatus()!=0){
+        if (order==null || order.getStatus()!=0
+        ){
             throw new IllegalArgumentException("订单不存在或已被审核");
         }
         CashRecord updateOrder = new CashRecord();
@@ -43,6 +44,26 @@ public class CashAuditServiceImpl implements CashAuditService {
         updateOrder.setOrderCode(orderCode);
         if (action==1){ //通过
             updateOrder.setStatus(1);
+
+            //往金币订单表加一条充值记录
+            UserGoldRecord rechargeOrder = new UserGoldRecord();
+            rechargeOrder.setOrderCode(orderCode.replaceFirst("^XJ_", "XJCZ_"));
+            rechargeOrder.setJwcode(order.getJwcode());
+            rechargeOrder.setActivity(order.getActivity());
+            rechargeOrder.setPermanentGold(order.getPermanentGold());
+            // 获取当前月份（1-12）
+            int currentMonth = LocalDate.now().getMonthValue();
+            // 根据当前月份设置对应字段
+            if (currentMonth >= 1 && currentMonth <= 6) {
+                // 1-6月：设置6月额度，12月保持默认值
+                rechargeOrder.setFreeJune(0);
+                rechargeOrder.setFreeDecember(order.getFreeGold());
+            } else {
+                // 7-12月：设置12月额度，6月保持默认值
+                rechargeOrder.setFreeJune(order.getFreeGold());
+                rechargeOrder.setFreeDecember(0);
+            }
+            rechargeOrder.setSumGold(order.getPermanentGold());
         }
         else if (action==2){ //驳回
             updateOrder.setStatus(2);

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

@@ -175,6 +175,10 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         if (markets.contains("9") || markets.contains("9999")){
             markets=null;
         }
+        if (cashCollection.getCashRoleId()==2)
+        {
+            cashCollection.setStatus(134);
+        }
         cashCollection.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<CashCollection> cashCollections = cashCollectionMapper.selectCollection1(pageNum, pageSize, cashCollection);

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -84,14 +84,6 @@
         left join admin a2 on cr.audit_id = a2.id
         <where>
             1 = 1
-            /*判断market 是否不为总部且 markets 不为空*/
-            <if test="cashCollection.markets != null and cashCollection.markets.size() > 0">
-                AND (
-                <foreach collection="cashCollection.markets" item="market" open="" close="" separator=" OR ">
-                    cr.market = #{market}
-                </foreach>
-                )
-            </if>
             <if test="cashCollection.market != null and cashCollection.market != ''">
                 AND  cr.market = #{cashCollection.market}
             </if>
@@ -101,18 +93,28 @@
         <if test="cashCollection.name!=null and cashCollection.name !=''">
             AND cr.name like concat('%',#{cashCollection.name},'%')
         </if>
+        <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>
         <if test="cashCollection.activity!=null and cashCollection.activity!=''">
             AND cr.activity like concat('%',#{cashCollection.activity},'%')
         </if>
+
         <if test="cashCollection.goodsName!=null and cashCollection.goodsName!=''">
             AND cr.goods_name like concat('%',#{cashCollection.goodsName},'%')
         </if>
         <if test="cashCollection.payType!=null and cashCollection.payType!=''">
             AND cr.pay_type = #{cashCollection.payType}
         </if>
-        <if test="cashCollection.status!=null and cashCollection.status!=''">
-            AND cr.status = #{cashCollection.status}
-        </if>
+            <if test="cashCollection.status != null">
+                AND cr.status IN
+                <foreach collection="cashCollection.status.toString().toCharArray()" item="digit" open="(" separator="," close=")">
+                    #{digit}
+                </foreach>
+            </if>
         <if test="cashCollection.startTime!=null and cashCollection.endTime!=null">
             AND cr.pay_time between #{cashCollection.startTime} and #{cashCollection.endTime}
         </if>