diff --git a/src/main/java/com/quinn/common/wx/AccBudgetDTO.java b/src/main/java/com/quinn/common/wx/AccBudgetDTO.java new file mode 100644 index 0000000..0dd2810 --- /dev/null +++ b/src/main/java/com/quinn/common/wx/AccBudgetDTO.java @@ -0,0 +1,41 @@ +package com.quinn.common.wx; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.quinn.pojo.AccBudget; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + *
+ * + *
+ * + * @author limqsh + * @since 2023-02-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("qn_acc_budget") +@ApiModel(value="AccBudget对象", description="") +public class AccBudgetDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private Double sumBudget = 0.0; + + private Double sumUsed = 0.0; + + private Double sumBalance = 0.0; + + List+ * + *
+ * + * @author limqsh + * @since 2023-02-09 + */ +@Data +public class BudgetDTO extends AccBudget { + + private String expendName; + + private Double used; + + private String expendIcon; + +} diff --git a/src/main/java/com/quinn/common/wx/EditBudget.java b/src/main/java/com/quinn/common/wx/EditBudget.java new file mode 100644 index 0000000..19b7d82 --- /dev/null +++ b/src/main/java/com/quinn/common/wx/EditBudget.java @@ -0,0 +1,11 @@ +package com.quinn.common.wx; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EditBudget implements Serializable { + private Integer expendId; + private Double budget; +} diff --git a/src/main/java/com/quinn/controller/wx/WxBillController.java b/src/main/java/com/quinn/controller/wx/WxBillController.java index f98ac9d..b42a42c 100644 --- a/src/main/java/com/quinn/controller/wx/WxBillController.java +++ b/src/main/java/com/quinn/controller/wx/WxBillController.java @@ -98,6 +98,8 @@ public class WxBillController extends BaseWxController{ */ @PostMapping("user/bill/del/{id}") public ResponseDTO deleteBill(@PathVariable("id") Integer id){ + AccBill byId = accBillService.getById(id); + modifyBalance(true,byId); accBillService.removeById(id); return ResponseDTO.ok(); } diff --git a/src/main/java/com/quinn/controller/wx/WxBudgetController.java b/src/main/java/com/quinn/controller/wx/WxBudgetController.java new file mode 100644 index 0000000..1383da6 --- /dev/null +++ b/src/main/java/com/quinn/controller/wx/WxBudgetController.java @@ -0,0 +1,69 @@ +package com.quinn.controller.wx; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.quinn.common.wx.AccBudgetDTO; +import com.quinn.common.wx.BudgetDTO; +import com.quinn.common.wx.EditBudget; +import com.quinn.dto.res.ResponseDTO; +import com.quinn.pojo.AccBudget; +import com.quinn.service.AccBudgetService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + *+ * 前端控制器 + *
+ * + * @author limqsh + * @since 2022-05-01 + */ +@RestController +@RequestMapping("/wx") +public class WxBudgetController extends BaseWxController{ + + @Resource + AccBudgetService accBudgetService; + + @PostMapping("user/budget") + public ResponseDTO getBudget(HttpServletRequest request){ + AccBudgetDTO result = new AccBudgetDTO(); + List