diff --git a/src/main/java/com/example/demo/controller/ProductController.java b/src/main/java/com/example/demo/controller/ProductController.java index b1ef17e..6f6d0d3 100644 --- a/src/main/java/com/example/demo/controller/ProductController.java +++ b/src/main/java/com/example/demo/controller/ProductController.java @@ -20,4 +20,3 @@ public class ProductController { return Result.success(productService.findAll(product)); } } - diff --git a/src/main/java/com/example/demo/controller/RechargeController.java b/src/main/java/com/example/demo/controller/RechargeController.java index 106dab4..3b1c697 100644 --- a/src/main/java/com/example/demo/controller/RechargeController.java +++ b/src/main/java/com/example/demo/controller/RechargeController.java @@ -36,7 +36,7 @@ public class RechargeController { // 发送消息到 Kafka 队列 kafkaProducer.sendMessage("recharge-topic", rechargeJson); - return Result.success("Request added to Kafka queue"); + return rechargeService.addRecharges(recharge); } catch (Exception e) { log.error(Arrays.toString(e.getStackTrace())); return Result.error(e.getMessage()); diff --git a/src/main/java/com/example/demo/controller/UserController.java b/src/main/java/com/example/demo/controller/UserController.java index bebc32a..dd63121 100644 --- a/src/main/java/com/example/demo/controller/UserController.java +++ b/src/main/java/com/example/demo/controller/UserController.java @@ -33,5 +33,8 @@ public class UserController { public Result search() throws Exception { return Result.success(userSevice.area()); } - + @PostMapping("/jwcode") + public Result jwcode() throws Exception { + return Result.success(userSevice.jwcode()); + } } diff --git a/src/main/java/com/example/demo/domain/entity/DetailY.java b/src/main/java/com/example/demo/domain/entity/DetailY.java index 5b2595a..e999d1a 100644 --- a/src/main/java/com/example/demo/domain/entity/DetailY.java +++ b/src/main/java/com/example/demo/domain/entity/DetailY.java @@ -44,7 +44,7 @@ public class DetailY implements Serializable { private String adminArea; private String adminName; - private String userName; + private String username; private String auditStatus; private String auditReson; private String orderCode; diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java index a2fbd77..c025cda 100644 --- a/src/main/java/com/example/demo/mapper/DetailYMapper.java +++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java @@ -12,13 +12,17 @@ import java.util.List; @Mapper public interface DetailYMapper { @Insert({ - "insert into detail_y", - "(jwcode,order_code,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods," + - "contact_id,remark,recharge_coin,free_coin,task_coin,admin_id,update_type,detail_flag,create_time,first_recharge)", - "values ", - "(#{jwcode},#{orderCode},#{activityId},#{rechargeWay},#{productId},#{consumePlatform},#{consumeType},#{refundType}" + - ",#{refundGoods},#{contactId},#{remark},#{rechargeCoin}" + - ",#{freeCoin},#{taskCoin},#{adminId},#{updateType},1,now(),#{firstRecharge})" +// "insert into detail_y", +// "(jwcode,order_code,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods,name,username,area" + +// "contact_id,remark,recharge_coin,free_coin,task_coin,admin_id,update_type,detail_flag,create_time,first_recharge)", +// "values ", +// "(#{jwcode},#{orderCode},#{activityId},#{rechargeWay},#{productId},#{consumePlatform},#{consumeType},#{refundType}" + +// ",#{refundGoods},#{name},#{username},#{area},#{contactId},#{remark},#{rechargeCoin}" + +// ",#{freeCoin},#{taskCoin},#{adminId},#{updateType},1,now(),#{firstRecharge})" + "insert into detail_y \n" + + "(jwcode, order_code, activity_id, recharge_way, product_id, consume_platform, consume_type, refund_type, refund_goods, name, username, area, contact_id, remark, recharge_coin, free_coin, task_coin, admin_id, update_type, detail_flag, create_time, first_recharge)\n" + + "values \n" + + "(#{jwcode}, #{orderCode}, #{activityId}, #{rechargeWay}, #{productId}, #{consumePlatform}, #{consumeType}, #{refundType}, #{refundGoods}, #{name}, #{username}, #{area}, #{contactId}, #{remark}, #{rechargeCoin}, #{freeCoin}, #{taskCoin}, #{adminId}, #{updateType}, 1, now(), #{firstRecharge})" }) @Options(useGeneratedKeys = true,keyColumn = "detaily_id",keyProperty = "detailyId") int add(DetailY detaily); @@ -54,7 +58,8 @@ public interface DetailYMapper { @Select({ "