Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-202509231533026-现金管理-收款管理' into milestone-20251016-现金管理

src/main/java/com/example/demo/controller/cash/CashCollectionController.java

@@ -3,6 +3,7 @@ package com.example.demo.controller.cash;
 import com.example.demo.Util.JWTUtil;
 import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.CashRecord;
+import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.cash.CashCollection;
 import com.example.demo.domain.vo.coin.Page;
 import com.example.demo.domain.vo.coin.Result;
@@ -36,11 +37,25 @@ public class CashCollectionController {
     @Autowired
     private CashCollectionService cashCollectionService;
 
+    //根据精网号获取姓名和地区
+    @PostMapping("/getNameAndMarket")
+    public User getNameAndMarket(@RequestBody Integer jwcode) {
+            return cashCollectionService.getNameAndMarket(jwcode);
+
+    }
+    //获取收款活动列表
+    @PostMapping("/getActivityList")
+    public Result getActivityList()
+    {
+        List<String> list = cashCollectionService.getActivityList();
+        return Result.success(list);
+    }
     //新增收款订单
     @PostMapping("/add")
     public Result add(@RequestBody CashCollection cashCollection) {
         try {
-            return cashCollectionService.add(cashCollection);
+
+            return Result.success(cashCollectionService.add(cashCollection));
         } catch (Exception e) {
             return Result.error(e.getMessage());
         }
@@ -49,7 +64,8 @@ public class CashCollectionController {
     @PostMapping("/cancel")
     public Result cancel(@RequestBody CashRecord cashRecord) {
         try {
-            return cashCollectionService.cancel(cashRecord.getOrderCode());
+
+            return Result.success( cashCollectionService.cancel(cashRecord.getOrderCode()));
         }catch (Exception e){
             return Result.error(e.getMessage());
         }

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

@@ -26,6 +26,7 @@ public class User implements Serializable {
     private String name; // 客户姓名
     @ExcelProperty("所属地区")
     private String market; // 所属地区
+       private String marketName; // 所属地区
     @ExcelIgnore
     private BigDecimal sumPermanentGold; // 历史永久金币
     @ExcelIgnore

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

@@ -39,4 +39,10 @@ public interface CashCollectionMapper {
     CashRecord selectUnAuditByOrderCode(@Param("orderCode") String orderCode);
     //补全手续费等信息
     int complete(@Param("cashRecord") CashRecord cashRecord);
+    //根据精网号获取姓名
+    String getNameByJwcode(@Param("jwcode") Integer jwcode);
+    //根据精网号获取市场名
+    String getMarketNameByJwcode(Integer jwcode);
+    //获取收款活动列表
+    List<String> getActivityList();
 }

src/main/java/com/example/demo/service/cash/CashCollectionService.java

@@ -1,10 +1,13 @@
 package com.example.demo.service.cash;
 
 import com.example.demo.domain.entity.CashRecord;
+import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.cash.CashCollection;
 import com.example.demo.domain.vo.coin.Result;
 import com.github.pagehelper.PageInfo;
 
+import java.util.List;
+
 /**
  * @program: gold-java
  * @ClassName cashCollectionService
@@ -25,4 +28,8 @@ public interface CashCollectionService {
     PageInfo<CashCollection> selectCollection(Integer pageNum, Integer pageSize, CashCollection cashCollection);
     //补全手续费等
     Result complete(CashRecord cashRecord);
+    //根据精网号获取姓名和地区
+    User getNameAndMarket(Integer jwcode);
+    //获取活动列表
+    List<String> getActivityList();
 }

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

@@ -1,6 +1,7 @@
 package com.example.demo.serviceImpl.cash;
 
 import com.example.demo.domain.entity.CashRecord;
+import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.cash.CashCollection;
 import com.example.demo.domain.vo.coin.Result;
 import com.example.demo.mapper.cash.CashCollectionMapper;
@@ -160,8 +161,8 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         if (!status.getStatus().equals(5)){
             return Result.error("只允许编辑已撤回订单");
         }
-        //地区，根据jwcode插入
-        cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(cashRecord.getJwcode()));
+        //地区，根据jwcode插入（弃用，插入前调用接口获取地区和姓名，之后前端传入）
+        //cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(cashRecord.getJwcode()));
         int rows = cashCollectionMapper.updateByOrderCode(cashRecord);
         return rows > 0 ? Result.success("重新提交成功") : Result.error("重新提交失败");
     }
@@ -185,4 +186,19 @@ public class CashCollectionServiceImpl implements CashCollectionService {
 
         return rows > 0 ? Result.success("编辑成功") : Result.error("编辑失败");
     }
+    //根据精网号查询姓名和地区
+    @Override
+    public User getNameAndMarket(Integer jwcode) {
+        User user = new User();
+        user.setMarket(cashCollectionMapper.getMarketByJwcode(jwcode));
+        user.setName(cashCollectionMapper.getNameByJwcode(jwcode));
+        user.setMarketName(cashCollectionMapper.getMarketNameByJwcode(jwcode));
+
+        return user;
+    }
+    //获取收款活动列表
+    @Override
+    public List<String> getActivityList() {
+        return cashCollectionMapper.getActivityList();
+    }
 }

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -60,7 +60,7 @@
     </update>
     <!--根据jwcode获取所属地区-->
     <select id="getMarketByJwcode" resultType="java.lang.String">
-        select market from user where jwcode=#{jwcode}
+      select market from user where jwcode=#{jwcode}
     </select>
     <!--根据订单号获取订单id与状态-->
     <select id="selectByOrderCode" resultType="com.example.demo.domain.entity.CashRecord">
@@ -130,4 +130,14 @@
     <select id="selectUnAuditByOrderCode" resultType="com.example.demo.domain.entity.CashRecord">
             select status,order_code from cash_record where order_code=#{orderCode}
     </select>
+    <!--根据精网号获取姓名-->
+    <select id="getNameByJwcode" resultType="java.lang.String">
+        select name from user where jwcode=#{jwcode}
+    </select>
+    <select id="getMarketNameByJwcode" resultType="java.lang.String">
+        select m.name from user u left join market m on u.market=m.id
+                 where u.jwcode=#{jwcode}</select>
+    <select id="getActivityList" resultType="java.lang.String">
+        select distinct activity from cash_record
+    </select>
 </mapper>