diff --git a/pom.xml b/pom.xml index 4113a6d..f4365b3 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,18 @@ spring-boot-starter-thymeleaf - + + org.apache.kafka + kafka-clients + 2.8.0 + + + org.apache.kafka + kafka_2.12 + 2.8.0 + + + diff --git a/src/main/java/com/example/demo/controller/DetailYController.java b/src/main/java/com/example/demo/controller/DetailYController.java new file mode 100644 index 0000000..9c93089 --- /dev/null +++ b/src/main/java/com/example/demo/controller/DetailYController.java @@ -0,0 +1,44 @@ +package com.example.demo.controller; + + +import com.example.demo.domain.entity.Detail; +import com.example.demo.domain.entity.DetailY; +import com.example.demo.domain.vo.Page; +import com.example.demo.domain.vo.Result; +import com.example.demo.sevice.DetailService; +import com.example.demo.sevice.DetailYService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.ObjectUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + + +@RestController +@RequestMapping("/detailY") +@RequiredArgsConstructor +@Slf4j +@CrossOrigin +public class DetailYController { + private final DetailYService detailYService; + @PostMapping("/add") + public Result add(@RequestBody DetailY detailY) { + try { + detailYService.add(detailY); + return Result.success(); + } catch (Exception e) { + log.warn(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } + } + @PostMapping + public Result search(@RequestBody Page page) { + if(ObjectUtils.isEmpty(page.getPageNum())){ + return Result.success(detailYService.getAllDetail(page.getDetailY())); + } + else { + return Result.success(detailYService.getDetailByPage(page.getPageNum(), page.getPageSize(), page.getDetailY())); + } + } +} diff --git a/src/main/java/com/example/demo/domain/entity/Audit.java b/src/main/java/com/example/demo/domain/entity/Audit.java index ffc72b5..02ca3b4 100644 --- a/src/main/java/com/example/demo/domain/entity/Audit.java +++ b/src/main/java/com/example/demo/domain/entity/Audit.java @@ -30,4 +30,6 @@ public class Audit { private BigDecimal freeGold; private BigDecimal paidGold; + + } diff --git a/src/main/java/com/example/demo/domain/entity/DetailY.java b/src/main/java/com/example/demo/domain/entity/DetailY.java new file mode 100644 index 0000000..490c2a5 --- /dev/null +++ b/src/main/java/com/example/demo/domain/entity/DetailY.java @@ -0,0 +1,67 @@ +package com.example.demo.domain.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@NoArgsConstructor +public class DetailY implements Serializable { + private Integer detailyId; + private String name; + private String jwcode; + private String area; + private Integer activityId; + private String rechargeWay; + private Integer productId; + private String consumePlatform; + private String consumeType; + private String refundType; + private String refundGoods; + private Integer contactId; + private String remark; + private BigDecimal rechargeCoin; + private BigDecimal freeCoin; + private BigDecimal taskCoin; + + private Integer adminId; + private Integer status; + private Integer updateType; + private Integer detailFlag; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date createTime; + + private Date endDate; + private Date startDate; + private String uname; + private Integer firstRecharge; + + private String adminArea; + private String adminName; + private String userName; + private String auditStatus; + private String auditReson; + private String orderCode; + private Integer refundFlag; + + + // @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") + private String productName; + private Integer refundId; + + private BigDecimal allCoin; + private String token; + + private BigDecimal free6; + private BigDecimal free12; + + private BigDecimal allGold; +} diff --git a/src/main/java/com/example/demo/domain/vo/Page.java b/src/main/java/com/example/demo/domain/vo/Page.java index 6691ae6..c6b361c 100644 --- a/src/main/java/com/example/demo/domain/vo/Page.java +++ b/src/main/java/com/example/demo/domain/vo/Page.java @@ -24,87 +24,8 @@ public class Page implements Serializable { private Detail detail; private DetailVo detailVo; private Admin admin; + private DetailY detailY; - - public Integer getPageNum() { - return pageNum; - } - - public void setPageNum(Integer pageNum) { - this.pageNum = pageNum; - } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public RechargeVo getRechargeVo() { - return rechargeVo; - } - - public void setRechargeVo(RechargeVo rechargeVo) { - this.rechargeVo = rechargeVo; - } - - public Activity getActivity() { - return activity; - } - - public void setActivity(Activity activity) { - this.activity = activity; - } - - public Rate getRate() { - return rate; - } - - public void setRate(Rate rate) { - this.rate = rate; - } - - public Audit getAudit() { - return audit; - } - - public void setAudit(Audit audit) { - this.audit = audit; - } - - public ConsumeDetail getConsumeDetail() { - return consumeDetail; - } - - public void setConsumeDetail(ConsumeDetail consumeDetail) { - this.consumeDetail = consumeDetail; - } - - public Detail getDetail() { - return detail; - } - - public void setDetail(Detail detail) { - this.detail = detail; - } - - public DetailVo getDetailVo() { - return detailVo; - } - - public void setDetailVo(DetailVo detailVo) { - this.detailVo = detailVo; - } - - public Admin getAdmin() { - return admin; - } - - public void setAdmin(Admin admin) { - this.admin = admin; - } } diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java new file mode 100644 index 0000000..70506a0 --- /dev/null +++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java @@ -0,0 +1,46 @@ +package com.example.demo.mapper; + +import com.example.demo.domain.entity.Detail; +import com.example.demo.domain.entity.DetailY; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Select; + +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})" + }) + @Options(useGeneratedKeys = true,keyColumn = "detaily_id",keyProperty = "detailyId") + int add(DetailY detaily); + @Select({ + "SELECT * from detail_y where detaily_id =#{detailyId}" + }) + Detail selectByDetailId(Integer detaily_id); + + @Select({ + "" + + }) + List select(DetailY detailY); +} diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 167ee83..18e2fda 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -4,6 +4,7 @@ package com.example.demo.serviceImpl; import com.example.demo.domain.entity.Audit; +import com.example.demo.domain.entity.Detail; import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.ConsumeDetail; import com.example.demo.mapper.AuditMapper; @@ -87,6 +88,35 @@ public class AuditServiceImpl implements AuditService { if (result != 1) { throw new Exception("Failed to insert recharge data"); } + +// int rechargeId = audit.getRechargeId(); +// String jwCode= audit.getJwcode(); +// String JwCode = audit.getJwcode(); +// int activityId = audit.getActivityId(); +// BigDecimal paidGold =audit.getPaidGold(); +// BigDecimal freeGold =audit.getFreeGold(); +// BigDecimal rechargeGold =audit.getRechargeGold(); +// String rechargeWay =audit.getRechargeWay(); +// String remark =audit.getRemark(); +// int adminId =audit.getAdminId(); +// Detail detail = new Detail(); +// detail.setJwcode(JwCode); +// detail.setActivityId(activityId); +// detail.setRechargeCoin(rechargeGold); +// detail.setFreeCoin(freeGold); +// detail.setRechargeWay(rechargeWay); +// detail.setRemark(remark); +// detail.setUpdateType("充值"); +// detail.setAdminId(adminId); +// +// +// System.out.println(uuid+"/*/*/*-/-*/-/*-/-*/-/*-/*-/-*"); +// detail.setOrderCode(uuid); +// System.out.println(detail); +// result = detailMapper.add(detail); +// if (result != 1) { +// throw new Exception("Failed to insert another entity"); +// } } return auditMapper.update(audit); } diff --git a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java new file mode 100644 index 0000000..d9c7286 --- /dev/null +++ b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java @@ -0,0 +1,44 @@ +package com.example.demo.serviceImpl; + +import com.example.demo.domain.entity.Detail; +import com.example.demo.domain.entity.DetailY; +import com.example.demo.mapper.DetailMapper; +import com.example.demo.mapper.DetailYMapper; +import com.example.demo.sevice.DetailYService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional +@RequiredArgsConstructor +@CacheConfig(cacheNames = "detailY") +public class DetailYServiceImpl implements DetailYService { + @Autowired + + private DetailYMapper detailYMapper; + @Override + public int add(DetailY detailY) { + return detailYMapper.add(detailY); + } + + @Override + public List getAllDetail(DetailY detailY) { + return detailYMapper.select(detailY); + } + + @Override + public PageInfo getDetailByPage(int pageNum, int pageSize, DetailY detailY) { + PageHelper.startPage(pageNum, pageSize); + List list= detailYMapper.select(detailY); + return new PageInfo<>(list); + } + + +} diff --git a/src/main/java/com/example/demo/sevice/DetailYService.java b/src/main/java/com/example/demo/sevice/DetailYService.java new file mode 100644 index 0000000..8e1e3c9 --- /dev/null +++ b/src/main/java/com/example/demo/sevice/DetailYService.java @@ -0,0 +1,13 @@ +package com.example.demo.sevice; + +import com.example.demo.domain.entity.Detail; +import com.example.demo.domain.entity.DetailY; +import com.github.pagehelper.PageInfo; + +import java.util.List; + +public interface DetailYService { + int add(DetailY detailY); + List getAllDetail(DetailY detailY); + PageInfo getDetailByPage(int pageNum, int pageSize, DetailY detailY); +}