Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20251104110749-现金管理二期' into milestone-20251104-现金管理二期

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

@@ -153,4 +153,13 @@ public class CashCollectionController {
             return Result.error(e.getMessage());
         }
     }
+    //根据goldcoin订单号查询收款订单
+    @PostMapping("/selectByGoldCoinOrderCode")
+    public Result selectByGoldCoinOrderCode(@RequestBody String orderNo) {
+        try {
+            return Result.success(cashCollectionService.selectByGoldCoinOrderCode(orderNo));
+        }catch (Exception e){
+            return Result.error(e.getMessage());
+        }
+    }
 }

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

@@ -24,6 +24,7 @@ public class RechargeActivity {
     private String businessBelong;  //业绩归属地
     private Integer status;         //状态 0未开始 1进行中 2已结束（不是实时更新的，仅展示，不要拿这个做校验）
     private Integer creator;        //添加人
+    private String area;    //归属地
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private LocalDateTime startTime;         // 开始时间（到秒）
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")

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

@@ -123,5 +123,11 @@ public class CashCollection implements Serializable {
     private String sortOrder; //排序顺序
     @ExcelIgnore
     private List<String> markets; // 所属地区列表
+    @ExcelIgnore
+    private String orderNo;
+    @ExcelIgnore
+    private String orderNoStatus;
+    @ExcelIgnore
+    private String payload;
 
     }

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

@@ -48,7 +48,7 @@ public interface CashCollectionMapper {
     //根据精网号获取市场名
     String getMarketNameByJwcode(Integer jwcode);
     //获取收款活动列表
-    List<RechargeActivity> getActivityList(@Param("now")LocalDateTime now);
+    List<RechargeActivity> getActivityList();
     //查找未同步的订单
     List<GOrder>getUnSync(@Param("size")int size);
     //给同步过去的gOrder设置同步状态
@@ -57,4 +57,6 @@ public interface CashCollectionMapper {
     CashCollection selectById(Integer id);
 
     List<CashCollection> selectBatchIds(Set<Integer> relatedIds);
+    //根据glodcoin订单号查询收款订单
+    CashCollection selectByGoldCoinOrderCode(String orderNo);
 }

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

@@ -37,4 +37,6 @@ public interface CashCollectionService {
     Object syncToCashRecord();
     //根据id查询收款订单
     CashCollection selectById(CashCollection cashCollection);
+    //根据goldcoin订单号查询收款订单
+    CashCollection selectByGoldCoinOrderCode(String orderNo);
 }

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

@@ -326,8 +326,7 @@ public User getNameAndMarket(Integer jwcode) {
     //获取收款活动列表
     @Override
     public List<RechargeActivity> getActivityList() {
-        LocalDateTime now = LocalDateTime.now();
-        return cashCollectionMapper.getActivityList(now);
+        return cashCollectionMapper.getActivityList();
     }
 
     //同步g_order订单到cash_record表
@@ -401,4 +400,9 @@ public User getNameAndMarket(Integer jwcode) {
 
         return cashCollectionMapper.selectById(cashCollection.getId());
     }
+    //根据goldcoin订单号查询收款订单
+    @Override
+    public CashCollection selectByGoldCoinOrderCode(String orderNo) {
+        return cashCollectionMapper.selectByGoldCoinOrderCode(orderNo);
+    }
 }

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -219,10 +219,11 @@
         select m.name from user u left join market m on u.market=m.id
                  where u.jwcode=#{jwcode}</select>
     <select id="getActivityList" resultType="com.example.demo.domain.entity.RechargeActivity">
-        select id,activity_name,business_belong,status
-        from recharge_activity
-        where #{now} between start_time and end_time
-    </select>
+        select ra.id,ra.activity_name,ra.business_belong,m.name as area,ra.status
+        from recharge_activity ra
+        left join market m on m.id=ra.area
+        where  ra.flag=1
+        </select>
     <!--查找未同步的订单-->
     <select id="getUnSync" resultType="com.example.demo.domain.entity.GOrder">
         select id,jwcode,order_no,type,price,count,pay_style,state,
@@ -272,4 +273,7 @@
             </foreach>
         </if>
     </select>
+    <select id="selectByGoldCoinOrderCode" resultType="com.example.demo.domain.vo.cash.CashCollection">
+        select * from cash_record_collection where order_no=#{orderNo}
+    </select>
 </mapper>