From 2e5ec4c7c528437a20fd7212096dedd26ed0f5cd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 02 九月 2025 15:36:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java               |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmBranchVO.java                    |   15 ++
 ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmBranchService.java          |   25 +++
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java        |    4 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpIssueReporting.java           |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java                  |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java                    |    6 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierOutbound.java         |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierOutboundGoods.java    |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicOutbound.java           |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoods.java                    |    4 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java                     |    3 
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCrmBranchMapper.java            |   13 +
 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java              |    5 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoodsExchange.java            |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java              |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java                   |    9 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchSalary.java             |    4 
 ruoyi-system/src/main/java/com/ruoyi/system/dto/TCrmBranchDTO.java                  |   25 +++
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousingBatch.java |    3 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrder.java                    |    5 
 ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmBranchQuery.java              |   36 +++++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java    |   94 +++++++++++++
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java         |    6 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmClinic.java                   |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java |   71 ++++++++++
 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchArea.java               |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicOutboundGoods.java      |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java      |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java      |    4 
 ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml                  |   33 ++++
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java   |    3 
 32 files changed, 358 insertions(+), 34 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java
index c939fb2..6788fee 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java
@@ -1,8 +1,24 @@
 package com.ruoyi.web.controller.api;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.dto.TCrmBranchDTO;
+import com.ruoyi.system.model.TCrmBranch;
+import com.ruoyi.system.model.TErpGoods;
+import com.ruoyi.system.query.TCrmBranchQuery;
+import com.ruoyi.system.service.TCrmBranchService;
+import com.ruoyi.system.vo.TCrmBranchVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,9 +28,83 @@
  * @author xiaochen
  * @since 2025-08-20
  */
+@Api(tags = "crm分公司管理")
 @RestController
 @RequestMapping("/t-crm-branch")
 public class TCrmBranchController {
 
+    private final TCrmBranchService crmBranchService;
+    @Autowired
+    public TCrmBranchController(TCrmBranchService crmBranchService) {
+        this.crmBranchService = crmBranchService;
+    }
+
+    /**
+     * 获取crm分公司管理管理列表
+     */
+    @ApiOperation(value = "获取crm分公司管理分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<TCrmBranchVO>> pageList(@RequestBody TCrmBranchQuery query) {
+        return R.ok(crmBranchService.pageList(query));
+    }
+
+    /**
+     * 获取crm分公司管理管理列表
+     */
+    @ApiOperation(value = "获取crm分公司管理列表")
+    @PostMapping(value = "/list")
+    public R<List<TCrmBranch>> list() {
+        return R.ok(crmBranchService.list(Wrappers.lambdaQuery(TCrmBranch.class).orderByDesc(TCrmBranch::getCreateTime)));
+    }
+
+    /**
+     * 添加crm分公司管理管理
+     */
+    @Log(title = "crm分公司管理信息-新增crm分公司管理", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加crm分公司管理")
+    @PostMapping(value = "/add")
+    public R<Boolean> add(@Validated @RequestBody TCrmBranchDTO dto) {
+        return crmBranchService.add(dto);
+    }
+
+    /**
+     * 修改crm分公司管理
+     */
+    @Log(title = "crm分公司管理信息-修改crm分公司管理", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改crm分公司管理")
+    @PostMapping(value = "/update")
+    public R<Boolean> update(@Validated @RequestBody TCrmBranch dto) {
+        return R.ok(crmBranchService.updateById(dto));
+    }
+
+    /**
+     * 查看crm分公司管理详情
+     */
+    @ApiOperation(value = "查看crm分公司管理详情")
+    @GetMapping(value = "/getDetailById")
+    public R<TCrmBranch> getDetailById(@RequestParam String id) {
+        return R.ok(crmBranchService.getById(id));
+    }
+
+    /**
+     * 删除crm分公司管理
+     */
+    @Log(title = "crm分公司管理信息-删除crm分公司管理", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除crm分公司管理")
+    @DeleteMapping(value = "/deleteById")
+    public R<Boolean> deleteById(@RequestParam String id) {
+        return R.ok(crmBranchService.removeById(id));
+    }
+
+    /**
+     * 批量删除crm分公司管理
+     */
+    @Log(title = "crm分公司管理信息-删除crm分公司管理", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "批量删除crm分公司管理")
+    @DeleteMapping(value = "/deleteByIds")
+    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+        return R.ok(crmBranchService.removeByIds(ids));
+    }
+    
 }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TCrmBranchDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TCrmBranchDTO.java
new file mode 100644
index 0000000..623cf75
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TCrmBranchDTO.java
@@ -0,0 +1,25 @@
+package com.ruoyi.system.dto;
+
+import com.ruoyi.system.model.TCrmBranch;
+import com.ruoyi.system.model.TCrmBranchArea;
+import com.ruoyi.system.model.TCrmBranchSalary;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "crm分公司管理DTO")
+public class TCrmBranchDTO extends TCrmBranch {
+
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    @ApiModelProperty(value = "省市列表")
+    private List<TCrmBranchArea> branchAreas;
+
+    @ApiModelProperty(value = "职位薪资列表")
+    private List<TCrmBranchSalary> branchSalaries;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCrmBranchMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCrmBranchMapper.java
index 81c674f..547fe78 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCrmBranchMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCrmBranchMapper.java
@@ -1,7 +1,13 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TCrmBranch;
+import com.ruoyi.system.query.TCrmBranchQuery;
+import com.ruoyi.system.vo.TCrmBranchVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,11 @@
  */
 public interface TCrmBranchMapper extends BaseMapper<TCrmBranch> {
 
+    /**
+     * 分页列表
+     *
+     * @param query 查询参数
+     * @return
+     */
+    List<TCrmBranchVO> pageList(@Param("query") TCrmBranchQuery query, @Param("pageInfo")PageInfo<TCrmBranchVO> pageInfo);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java
index 11792a3..68838ac 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java
@@ -8,6 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -46,12 +47,12 @@
     private String phone;
 
     @ApiModelProperty(value = "百分比分佣")
-    @TableField("money_commiss")
-    private Double moneyCommiss;
+    @TableField("money_commission")
+    private BigDecimal moneyCommission;
 
     @ApiModelProperty(value = "积分获得限制")
-    @TableField("points_commiss")
-    private Double pointsCommiss;
+    @TableField("points_commission")
+    private BigDecimal pointsCommission;
 
     @ApiModelProperty(value = "用户积分")
     @TableField("user_points")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchArea.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchArea.java
index 8cd0adb..03a74de 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchArea.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchArea.java
@@ -31,7 +31,7 @@
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
-    @ApiModelProperty(value = "分公司名称")
+    @ApiModelProperty(value = "分公司id")
     @TableField("branch_id")
     private String branchId;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchSalary.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchSalary.java
index ce41558..866f966 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchSalary.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchSalary.java
@@ -41,11 +41,11 @@
 
     @ApiModelProperty(value = "底薪")
     @TableField("base_salary")
-    private Double baseSalary;
+    private BigDecimal baseSalary;
 
     @ApiModelProperty(value = "差旅补助")
     @TableField("travel_allowance")
-    private Double travelAllowance;
+    private BigDecimal travelAllowance;
 
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmClinic.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmClinic.java
index 3cba3f0..4bf3bd8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmClinic.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmClinic.java
@@ -55,7 +55,7 @@
 
     @ApiModelProperty(value = "最低采购金额")
     @TableField("low_procurement_money")
-    private Double lowProcurementMoney;
+    private BigDecimal lowProcurementMoney;
 
     @ApiModelProperty(value = "诊所地址")
     @TableField("clinic_address")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java
index 2a1e7fe..697f79d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java
@@ -8,6 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -47,11 +48,11 @@
 
     @ApiModelProperty(value = "百分比分佣")
     @TableField("money_commission")
-    private Double moneyCommission;
+    private BigDecimal moneyCommission;
 
     @ApiModelProperty(value = "积分获得限制")
     @TableField("points_commission")
-    private Double pointsCommission;
+    private BigDecimal pointsCommission;
 
     @ApiModelProperty(value = "用户积分")
     @TableField("user_points")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicOutbound.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicOutbound.java
index 5a485cd..1b34180 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicOutbound.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicOutbound.java
@@ -43,7 +43,7 @@
 
     @ApiModelProperty(value = "出库总价")
     @TableField("total_money")
-    private Double totalMoney;
+    private BigDecimal totalMoney;
 
     @ApiModelProperty(value = "出库单号")
     @TableField("outbound_number")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicOutboundGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicOutboundGoods.java
index 7835f90..a595a2e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicOutboundGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicOutboundGoods.java
@@ -49,7 +49,7 @@
 
     @ApiModelProperty(value = "总价")
     @TableField("total_price")
-    private Double totalPrice;
+    private BigDecimal totalPrice;
 
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java
index 7d635b3..5e93e1d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java
@@ -55,7 +55,7 @@
 
     @ApiModelProperty(value = "售价")
     @TableField("sales_amount")
-    private Double salesAmount;
+    private BigDecimal salesAmount;
 
     @ApiModelProperty(value = "所需数量（采购数量）")
     @TableField("purchase_count")
@@ -63,7 +63,7 @@
 
     @ApiModelProperty(value = "总价")
     @TableField("total_price")
-    private Double totalPrice;
+    private BigDecimal totalPrice;
 
     @ApiModelProperty(value = "入库类型 1=平台商品入库 2=非平台商品入库")
     @TableField("warehousing_type")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java
index a25bb39..a5d2717 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -45,10 +46,12 @@
     private String batchNumber;
 
     @ApiModelProperty(value = "生产日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("production_date")
     private LocalDateTime productionDate;
 
     @ApiModelProperty(value = "有效日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("expiry_date")
     private LocalDateTime expiryDate;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
index d87c59c..7970679 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
@@ -96,7 +96,7 @@
 
     @ApiModelProperty(value = "商品售价")
     @TableField("sales_amount")
-    private Double salesAmount;
+    private BigDecimal salesAmount;
 
     @ApiModelProperty(value = "包装单位,单位id")
     @TableField("packing_unit_id")
@@ -112,11 +112,11 @@
 
     @ApiModelProperty(value = "诊所采购价")
     @TableField("clinic_purchase_price")
-    private Double clinicPurchasePrice;
+    private BigDecimal clinicPurchasePrice;
 
     @ApiModelProperty(value = "平台分佣金额")
     @TableField("platform_commission_price")
-    private Double platformCommissionPrice;
+    private BigDecimal platformCommissionPrice;
 
     @ApiModelProperty(value = "1启用 2禁用")
     private Integer state;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpIssueReporting.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpIssueReporting.java
index 7ceee7c..6784a98 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpIssueReporting.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpIssueReporting.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.model;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,6 +59,7 @@
     private String handlerPerson;
 
     @ApiModelProperty(value = "处理时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("handler_time")
     private LocalDateTime handlerTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java
index c0850ab..d4f56a2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.model;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -50,6 +51,7 @@
     private Integer maintenancePersonId;
 
     @ApiModelProperty(value = "维护时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("maintenance_time")
     private LocalDateTime maintenanceTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
index f61de6e..01dcea2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
@@ -39,7 +39,7 @@
 
     @ApiModelProperty(value = "支付金额")
     @TableField("pay_money")
-    private Double payMoney;
+    private BigDecimal payMoney;
 
     @ApiModelProperty(value = "支付单号")
     @TableField("pay_number")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java
index d9a56c3..92d764c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java
@@ -55,11 +55,11 @@
 
     @ApiModelProperty(value = "采购价")
     @TableField("purchase_price")
-    private Double purchasePrice;
+    private BigDecimal purchasePrice;
 
     @ApiModelProperty(value = "售价")
     @TableField("sales_amount")
-    private Double salesAmount;
+    private BigDecimal salesAmount;
 
     @ApiModelProperty(value = "采购数量")
     @TableField("purchase_count")
@@ -67,6 +67,6 @@
 
     @ApiModelProperty(value = "总价")
     @TableField("total_price")
-    private Double totalPrice;
+    private BigDecimal totalPrice;
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierOutbound.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierOutbound.java
index daf678b..020c391 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierOutbound.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierOutbound.java
@@ -43,7 +43,7 @@
 
     @ApiModelProperty(value = "出库总价")
     @TableField("total_money")
-    private Double totalMoney;
+    private BigDecimal totalMoney;
 
     @ApiModelProperty(value = "出库单号")
     @TableField("outbound_number")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierOutboundGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierOutboundGoods.java
index 01e8b1b..c0f9a5f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierOutboundGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierOutboundGoods.java
@@ -48,7 +48,7 @@
 
     @ApiModelProperty(value = "总价")
     @TableField("total_price")
-    private Double totalPrice;
+    private BigDecimal totalPrice;
 
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java
index 8c31c93..61e5bcc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java
@@ -51,10 +51,10 @@
 
     @ApiModelProperty(value = "单价")
     @TableField("unit_amount")
-    private Double unitAmount;
+    private BigDecimal unitAmount;
 
     @ApiModelProperty(value = "总价")
     @TableField("total_price")
-    private Double totalPrice;
+    private BigDecimal totalPrice;
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousingBatch.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousingBatch.java
index 4fb85ad..97b84d7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousingBatch.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousingBatch.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -44,10 +45,12 @@
     private String batchNumber;
 
     @ApiModelProperty(value = "生产日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("production_date")
     private LocalDateTime productionDate;
 
     @ApiModelProperty(value = "有效日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("expiry_date")
     private LocalDateTime expiryDate;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java
index f0973f4..bb307db 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.model;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,6 +39,7 @@
     private String phone;
 
     @ApiModelProperty(value = "出生日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("birth_time")
     private LocalDateTime birthTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoods.java
index 9dbb0d8..ff6fc60 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoods.java
@@ -35,11 +35,11 @@
 
     @ApiModelProperty(value = "所需积分")
     @TableField("required_points")
-    private Double requiredPoints;
+    private BigDecimal requiredPoints;
 
     @ApiModelProperty(value = "零售价")
     @TableField("retail_price")
-    private Double retailPrice;
+    private BigDecimal retailPrice;
 
     @ApiModelProperty(value = "商品总数")
     @TableField("goods_total")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoodsExchange.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoodsExchange.java
index 8e702bb..e33d2e7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoodsExchange.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoodsExchange.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.model;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -50,6 +51,7 @@
     private Integer usePoints;
 
     @ApiModelProperty(value = "兑换时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("exchange_time")
     private LocalDateTime exchangeTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java
index 6bf1576..cadf707 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.model;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -42,10 +43,12 @@
     private String liveIntroduction;
 
     @ApiModelProperty(value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("start_time")
     private LocalDateTime startTime;
 
     @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("end_time")
     private LocalDateTime endTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrder.java
index fac0bb6..f829a4c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrder.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.model;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,7 @@
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -43,9 +45,10 @@
 
     @ApiModelProperty(value = "订单总价")
     @TableField("total_money")
-    private Double totalMoney;
+    private BigDecimal totalMoney;
 
     @ApiModelProperty(value = "检查时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("check_time")
     private LocalDateTime checkTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java
index be288da..676b856 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java
@@ -55,6 +55,6 @@
 
     @ApiModelProperty(value = "售价")
     @TableField("sale_amount")
-    private Double saleAmount;
+    private BigDecimal saleAmount;
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmBranchQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmBranchQuery.java
new file mode 100644
index 0000000..37149e5
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmBranchQuery.java
@@ -0,0 +1,36 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "crm分公司查询参数TCrmBranchQuery")
+public class TCrmBranchQuery extends BasePage {
+
+    @ApiModelProperty(value = "分公司名称")
+    private String branchName;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "状态 1=使用中 2=已冻结")
+    private Integer status;
+
+    @ApiModelProperty(value = "省份code")
+    private String provinceCode;
+
+    @ApiModelProperty(value = "城市code")
+    private String cityCode;
+
+    @ApiModelProperty(value = "分公司id，前端忽略")
+    private List<String> branchIds;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmBranchService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmBranchService.java
index 7e19d23..38efae4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmBranchService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmBranchService.java
@@ -1,7 +1,13 @@
 package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.dto.TCrmBranchDTO;
 import com.ruoyi.system.model.TCrmBranch;
+import com.ruoyi.system.model.TCrmDevice;
+import com.ruoyi.system.query.TCrmBranchQuery;
+import com.ruoyi.system.vo.TCrmBranchVO;
 
 /**
  * <p>
@@ -13,4 +19,23 @@
  */
 public interface TCrmBranchService extends IService<TCrmBranch> {
 
+    /**
+     * 分页列表
+     * @param query
+     * @return
+     */
+    PageInfo<TCrmBranchVO> pageList(TCrmBranchQuery query);
+
+    /**
+     * 添加
+     * @param dto
+     * @return
+     */
+    R<Boolean> add(TCrmBranchDTO dto);
+    /**
+     * 判断分类是否存在
+     * @param dto
+     * @return
+     */
+    boolean isExit(TCrmBranchDTO dto);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java
index 37d6abd..cf53135 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java
@@ -1,10 +1,26 @@
 package com.ruoyi.system.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.dto.TCrmBranchDTO;
+import com.ruoyi.system.mapper.TCrmBranchAreaMapper;
 import com.ruoyi.system.mapper.TCrmBranchMapper;
 import com.ruoyi.system.model.TCrmBranch;
+import com.ruoyi.system.model.TCrmBranchArea;
+import com.ruoyi.system.model.TCrmDevice;
+import com.ruoyi.system.query.TCrmBranchQuery;
 import com.ruoyi.system.service.TCrmBranchService;
+import com.ruoyi.system.vo.TCrmBranchVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -17,4 +33,59 @@
 @Service
 public class TCrmBranchServiceImpl extends ServiceImpl<TCrmBranchMapper, TCrmBranch> implements TCrmBranchService {
 
+    @Autowired
+    private TCrmBranchAreaMapper crmBranchAreaMapper;
+
+    @Override
+    public PageInfo<TCrmBranchVO> pageList(TCrmBranchQuery query) {
+        List<TCrmBranchArea> crmBranchAreas = new ArrayList<>();
+        if(StringUtils.isNotEmpty(query.getCityCode())){
+            crmBranchAreas = crmBranchAreaMapper.selectList(Wrappers.lambdaQuery(TCrmBranchArea.class)
+                    .eq(TCrmBranchArea::getCityCode, query.getCityCode()));
+        }
+
+        if(!StringUtils.isNotEmpty(query.getCityCode()) && StringUtils.isNotEmpty(query.getProvinceCode())){
+            crmBranchAreas = crmBranchAreaMapper.selectList(Wrappers.lambdaQuery(TCrmBranchArea.class)
+                    .eq(TCrmBranchArea::getProvinceCode, query.getProvinceCode()));
+        }
+        if(!CollectionUtils.isEmpty(crmBranchAreas)){
+            List<String> branchIds = crmBranchAreas.stream().map(TCrmBranchArea::getBranchId).collect(Collectors.toList());
+            query.setBranchIds(branchIds);
+        }
+        PageInfo<TCrmBranchVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<TCrmBranchVO> list = this.baseMapper.pageList(query,pageInfo);
+        if(CollectionUtils.isEmpty(list)){
+            return pageInfo;
+        }
+        List<String> branchIds = list.stream().map(TCrmBranchVO::getId).collect(Collectors.toList());
+        List<TCrmBranchArea> crmBranchAreaList = crmBranchAreaMapper.selectList(Wrappers.lambdaQuery(TCrmBranchArea.class)
+                .in(TCrmBranchArea::getBranchId, branchIds));
+        for (TCrmBranchVO tCrmBranchVO : list) {
+            List<TCrmBranchArea> tCrmBranchAreas = crmBranchAreaList.stream().filter(t -> t.getBranchId().equals(tCrmBranchVO.getId())).collect(Collectors.toList());
+            if(!CollectionUtils.isEmpty(tCrmBranchAreas)){
+                tCrmBranchVO.setProvinceName(tCrmBranchAreas.get(0).getProvinceName());
+            }
+        }
+        pageInfo.setRecords(list);
+        return pageInfo;
+    }
+
+    @Override
+    public R<Boolean> add(TCrmBranchDTO dto) {
+        if (isExit(dto)) {
+            return R.fail("crm分公司管理名称已存在");
+        }
+        return null;
+    }
+
+    @Override
+    public boolean isExit(TCrmBranchDTO dto) {
+        if(StringUtils.isNotEmpty(dto.getId())){
+            // 修改
+            return this.count(Wrappers.lambdaQuery(TCrmBranch.class).ne(TCrmBranch::getId, dto.getId()).eq(TCrmBranch::getBranchName, dto.getBranchName())) > 0;
+        }else {
+            // 新增
+            return this.count(Wrappers.lambdaQuery(TCrmBranch.class).eq(TCrmBranch::getBranchName, dto.getBranchName())) > 0;
+        }
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmBranchVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmBranchVO.java
new file mode 100644
index 0000000..8b16907
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmBranchVO.java
@@ -0,0 +1,15 @@
+package com.ruoyi.system.vo;
+
+import com.ruoyi.system.model.TCrmBranch;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "crm分公司管理VO")
+public class TCrmBranchVO extends TCrmBranch {
+
+    @ApiModelProperty(value = "省份")
+    private String provinceName;
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml
index 0395afd..6184c2e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml
@@ -9,8 +9,8 @@
         <result column="branch_name" property="branchName" />
         <result column="user_name" property="userName" />
         <result column="phone" property="phone" />
-        <result column="money_commiss" property="moneyCommiss" />
-        <result column="points_commiss" property="pointsCommiss" />
+        <result column="money_commission" property="moneyCommission" />
+        <result column="points_commission" property="pointsCommission" />
         <result column="user_points" property="userPoints" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -22,7 +22,34 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, branch_name, user_name, phone, money_commiss, points_commiss, user_points, status, create_time, update_time, create_by, update_by, disabled
+        id, user_id, branch_name, user_name, phone, money_commission, points_commission, user_points, status, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.vo.TCrmBranchVO">
+        select id, user_id, branch_name, user_name, phone, money_commission, points_commission,
+               user_points, status, create_time, update_time, create_by, update_by, disabled
+        from t_crm_branch
+        <where>
+            <if test="query.branchName != null and query.branchName != ''">
+                and branch_name like concat('%',#{query.branchName},'%')
+            </if>
+            <if test="query.userName != null and query.userName != ''">
+                and user_name like concat('%',#{query.userName},'%')
+            </if>
+            <if test="query.phone != null and query.phone != ''">
+                and phone like concat('%',#{query.phone},'%')
+            </if>
+            <if test="query.status != null">
+                and status = #{query.status}
+            </if>
+            <if test="query.branchIds != null and query.branchIds.size()>0">
+                and id in
+                <foreach item="item" collection="query.branchIds" separator="," open="(" close=")" index="">
+                    #{item}
+                </foreach>
+            </if>
+            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+        </where>
+        ORDER BY create_time DESC
+    </select>
 
 </mapper>

--
Gitblit v1.7.1