Merge remote-tracking branch 'origin/milestone-20251016-现金管理' into milestone-20251016-现金管理

src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java

@@ -27,4 +27,6 @@ public interface CashRefundMapper {
     int executor(CashRecordDone cashRecordDone);
 
     int updateStatus(CashRecordDone cashRecordDone);
+    void addAudit(CashRecordDone cashRecordDone);
+    void updateAudit(CashRecordDone cashRecordDone);
 }

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

@@ -65,6 +65,11 @@ public class CashRefundServiceImpl implements RefundService {
         if(cashRecordDone.getRefundReason()== null){
             throw new Exception("请填写退款理由") ;
         }
+        CashRecordDone cashRecordDonetwo = new CashRecordDone();
+        cashRecordDonetwo.setAreaServise(cashRecordDone.getAreaServise());
+        cashRefundMapper.addAudit(cashRecordDonetwo);
+        cashRecordDone.setAuditId(cashRecordDonetwo.getId());
+
         cashRecordDone.setOrderType(2);
         cashRecordDone.setStatus(10);
         //生成订单号后半部分
@@ -112,6 +117,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
             cashRecordDone1.setStatus(4);
             cashRefundMapper.updateStatus(cashRecordDone1);
         }
+        cashRefundMapper.updateAudit(cashRecordDone);
         int result = cashRefundMapper.review(cashRecordDone);
         return (result > 0 ? Result.success("提交成功") : Result.error("提交失败")).getCode();
     }
@@ -186,7 +192,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
                 GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 58, //退款免费+永久金币-充值
                         (double) (userGoldRecord.getFreeDecember()+userGoldRecord.getFreeJune()+userGoldRecord.getPermanentGold() ) /100,
                         userGoldRecord.getRemark(),(double) userGoldRecord.getPermanentGold() / 100, auditName, "退款金币充值");}
-
+        cashRefundMapper.updateAudit(cashRecordDone);
         int result = cashRefundMapper.review(cashRecordDone);
         return (result > 0 ? Result.success("提交成功") : Result.error("提交失败")).getCode();
     }

src/main/resources/application-dev.yml

@@ -100,3 +100,4 @@ bean:
   consume:
     url: http://39.101.133.168:8828/hljwgo/api/wallet/pay
 server:
+  port: 10704

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -64,6 +64,26 @@
                      #{refundVoucher}
                  );
     </insert>
+    <insert id="addAudit" parameterType="com.example.demo.domain.vo.cash.CashRecordDone" useGeneratedKeys="true" keyProperty="id">
+                insert into lhl_audit
+                (
+                    id,
+                    area_servise,
+                    area_finance,
+                    area_charge,
+                    head_finance,
+                    execcutor,
+                )
+                values(
+                    #{id},
+                    #{areaServise},
+                    #{areaFinance},
+                    #{areacharge},
+                    #{head_finance},
+                    #{executor}
+                )
+
+    </insert>
     <update id="update">
         update cash_record
             set
@@ -102,6 +122,27 @@
             </if>
         </where>
     </update>
+    <update id="updateAudit">
+        update lhl_audit
+        <set>
+            <if test="area_servise != null">
+                area_servise = #{area_servise},
+            </if>
+            <if test="area_finance != null">
+                area_finance = #{area_finance},
+            </if>
+            <if test="area_charge != null">
+                area_charge = #{area_charge},
+            </if>
+            <if test="head_finance != null">
+                head_finance = #{head_finance},
+            </if>
+            <if test="execcutor != null">
+                execcutor = #{execcutor},
+            </if>
+        </set>
+        where id = #{auditId}
+    </update>
 
 
     <select id="select" resultType="com.example.demo.domain.vo.cash.CashRecordDone">
@@ -142,12 +183,11 @@
         cr.update_time,
         cr.audit_time,
         a1.admin_name as submitterName,
-        a2.admin_name as auditName,
         a3.admin_name as executorName,
         a2.area_servise,
         a2.area_finance,
         a2.area_charge,
-        a2.head_finance
+        a2.head_finance,
         m.name as marketName
         from cash_record cr
         left join admin a1 on submitter_id = a1.id