后端整合模块

src/main/java/com/example/demo/controller/RefundController.java

@@ -66,12 +66,12 @@ public class RefundController {
         }
     }
 
-    @PostMapping("/searchByOrderCode")
-    public Result searchByOrderCode(@RequestParam String orderCode) {
-        Detail detail = refundService.selectByOrderCode(orderCode);
+    @PostMapping("/searchByJWCODE")
+    public Result searchByOrderCode(@RequestParam String jwcode) {
+        Detail detail = refundService.selectByJWCODE(jwcode);
         // 检查返回的结果是否为空或无效
         if (detail == null || ObjectUtils.isEmpty(detail.getOrderCode())) {
-            return Result.error("该订单不存在：" + orderCode);
+            return Result.error("该订单不存在：");
         }
 
         // 成功时返回包含订单详情的数据

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

@@ -15,9 +15,11 @@ public class Rate {
     private Date endTime;
     private String currency;
     private String exchangeRate;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private Date updateTime;
     private Integer adminId;
     private String adminName;
+    private String updateId;
 }

src/main/java/com/example/demo/mapper/ConsumeMapper.java

@@ -63,7 +63,7 @@ public interface ConsumeMapper {
     @Select({
             "select * ,product.name as productName from detail " ,
             "inner join product on detail.product_id= product.product_id ",
-            "where  `detail_flag`=1 AND update_type = '消费' and jwcode=#{jwcode}"
+            "where  `detail_flag`=1 AND update_type = '消费' and jwcode=#{jwcode} AND refund_flag=1"
     })
     List<Detail> getDeatil(Integer jwcode);
 

src/main/java/com/example/demo/mapper/RateMapper.java

@@ -35,7 +35,7 @@ public interface RateMapper {
             "<if test='currency!=null and currency.length>0'>currency=#{currency},</if>",
             "<if test='exchangeRate!=null'>exchange_rate=#{exchangeRate},</if>",
             "<if test='updateTime!=null'>update_time=#{updateTime},</if>",
-            "<if test='adminId!=null'>admin_id=#{adminId},</if>",
+            "<if test='updateId!=null'>update_id=#{updateId},</if>",
             "</set>",
             "where rate_id = #{rateId}",
             "</script>"
@@ -49,9 +49,10 @@ public interface RateMapper {
 
     @Select({
             "<script>",
-            "SELECT r.*, a.name AS adminName",
+            "SELECT r.*, a.name AS submitName, u.name AS updateName",
             "FROM rate r",
             "LEFT JOIN admin a ON r.admin_id = a.admin_id",
+            "LEFT JOIN admin u ON r.admin_id = u.admin_id",
             "<where>",
             "<if test='rateId != null'>AND r.rate_id = #{rateId}</if>",
             "<if test='startTime != null'>AND r.start_time &gt;= #{startTime}</if>",
@@ -60,6 +61,7 @@ public interface RateMapper {
             "<if test='exchangeRate != null'>AND r.exchange_rate LIKE CONCAT('%', #{exchangeRate}, '%')</if>",
             "<if test='updateTime != null'>AND r.update_time LIKE CONCAT('%', #{updateTime}, '%')</if>",
             "<if test='adminId != null'>AND r.admin_id = #{adminId}</if>",
+            "<if test='updateId != null'>AND r.update_id = #{updateId}</if>",
             "</where>",
             "</script>"
 

src/main/java/com/example/demo/mapper/RechargeMapper.java

@@ -43,7 +43,7 @@ public interface RechargeMapper {
             "<if test='adminId!=null'>and recharge.admin_id=#{adminId}</if>",
             "<if test='startDate != null and endDate != null'>AND recharge.create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "<if test='payWay!=null and payWay.length>0 '>and pay_way like concat('%',#{payWay},'%')</if>",
-            "<if test='area!=null and area.length>0'>and area like concat('%',#{area},'%')</if>",
+            "<if test='area!=null and area.length>0'>and area=#{area}</if>",
             "<if test='status!=null'>and audit.status=#{status}</if>",
             "</where>",
             "ORDER BY recharge.create_time DESC",

src/main/java/com/example/demo/mapper/RefundMapper.java

@@ -42,8 +42,8 @@ public interface RefundMapper {
     @Select("SELECT d.*, p.name AS productName " +
             "FROM detail d " +
             "LEFT JOIN product p ON d.product_id = p.product_id " +
-            "WHERE d.order_code = #{orderCode} AND d.detail_flag = 1 AND d.refund_flag = 1")
-    Detail selectByOrderCode(@Param("orderCode") String orderCode);
+            "WHERE d.jwcode = #{jwcode} AND d.detail_flag = 1 AND d.refund_flag = 1")
+    Detail selectByJWCODE(String jwcode);
 
     //软删除
     @Update("update detail set detail_flag = 0 where detail_id = #{detailId}")

src/main/java/com/example/demo/mapper/UserMapper.java

@@ -71,7 +71,10 @@ public interface UserMapper {
             "<script>",
             "update user",
             "<set>",
-            "<if test='sumgold!=null'>sumgold=#{sumgold},</if>",
+            "<if test='buyJb!=null'>buy_jb=#{buyJb},</if>",
+            "<if test='coreJb!=null'>core_jb=#{coreJb},</if>",
+            "<if test='free6!=null'>free_6=#{free6},</if>",
+            "<if test='free12!=null'>free_12=#{free12},</if>",
             "</set>",
             "where jwcode=#{jwcode}",
             "</script>",

src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java

@@ -45,11 +45,12 @@ public class ConsumeServiceImpl implements ConsumeService {
         String jwcode = detail.getJwcode();
         User user = userMapper.get(jwcode);
         BigDecimal buyJb =user.getBuyJb();
-
+        BigDecimal coreJb=user.getCoreJb();
         buyJb = buyJb.add(paidGold1);
-
+        coreJb = coreJb.add(taskGold1);
 // 设置更新后的Sumgold回到user对象
         user.setBuyJb(buyJb);
+        user.setCoreJb(coreJb);
         LocalDate now = LocalDate.now();
 
 // 判断当前日期是在六月之前还是之后

src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java

@@ -86,8 +86,8 @@ public class RefundServiceImpl implements RefundService {
     }
 
     @Override
-    public Detail selectByOrderCode(String orderCode) {
-        return refundMapper.selectByOrderCode(orderCode);
+    public Detail selectByJWCODE(String jwcode) {
+        return refundMapper.selectByJWCODE(jwcode);
     }
 
     @Override

src/main/java/com/example/demo/sevice/RefundService.java

@@ -15,7 +15,7 @@ public interface RefundService {
     int update(Integer contactId) ;
     boolean existsByContactId(Integer contactId);
     int softDelete(Integer detailId) ;
-    Detail selectByOrderCode(String orderCode) ;
+    Detail selectByJWCODE(String jwcode) ;
     Detail selectByDetailId(Integer detailId);
     List<Detail> search(Detail detail);
     PageInfo<Detail> searchForPage(Integer pageNum, Integer pageSize, Detail detail);