Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
0f5fadef
Commit
0f5fadef
authored
Jul 03, 2024
by
lanbaoming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-07-03-2提交
parent
df7ba16c
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6 additions
and
8 deletions
+6
-8
CustomerController.java
...ustomer/controller/admin/customer/CustomerController.java
+0
-1
CustomerAnalysisResp.java
...er/yudao/module/delivery/entity/CustomerAnalysisResp.java
+0
-1
EcwReportPermission.java
...der/yudao/module/delivery/entity/EcwReportPermission.java
+1
-1
view_order_businesstimeMapper.java
...module/delivery/mapper/view_order_businesstimeMapper.java
+2
-2
CustomerAnalysisMapper.xml
...rest/src/main/resources/mapper/CustomerAnalysisMapper.xml
+1
-1
MakeBillOfLadingController.java
...shipment/controller/admin/MakeBillOfLadingController.java
+1
-1
ReceiptItemController.java
...h/controller/admin/receiptItem/ReceiptItemController.java
+1
-1
No files found.
yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.java
View file @
0f5fadef
...
@@ -846,7 +846,6 @@ public class CustomerController {
...
@@ -846,7 +846,6 @@ public class CustomerController {
@Idempotent
(
timeout
=
5
)
@Idempotent
(
timeout
=
5
)
public
CommonResult
<
Boolean
>
catchCustomer
(
@RequestParam
(
"id"
)
Long
id
)
{
public
CommonResult
<
Boolean
>
catchCustomer
(
@RequestParam
(
"id"
)
Long
id
)
{
//公海池捞取客户,修改客户业绩类型需要调整此处的逻辑
//公海池捞取客户,修改客户业绩类型需要调整此处的逻辑
//lanbm 2024-05-07 处理
customerService
.
catchCustomer
(
id
);
customerService
.
catchCustomer
(
id
);
return
success
(
true
);
return
success
(
true
);
}
}
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/CustomerAnalysisResp.java
View file @
0f5fadef
...
@@ -10,7 +10,6 @@ import java.math.BigDecimal;
...
@@ -10,7 +10,6 @@ import java.math.BigDecimal;
/*
/*
客户分析结果
客户分析结果
lanbm 2024-04-02 add
字段值名称首字母要小写,字段中不能含有下划线
字段值名称首字母要小写,字段中不能含有下划线
*/
*/
@ApiModel
(
"管理后台-客户分析报表结果"
)
@ApiModel
(
"管理后台-客户分析报表结果"
)
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/EcwReportPermission.java
View file @
0f5fadef
...
@@ -10,7 +10,7 @@ import lombok.*;
...
@@ -10,7 +10,7 @@ import lombok.*;
/**
/**
* 报表权限(EcwReportPermission)实体类
* 报表权限(EcwReportPermission)实体类
*
*
* @author
lanbm
* @author
* @since 2024-04-09 23:10:39
* @since 2024-04-09 23:10:39
*/
*/
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/mapper/view_order_businesstimeMapper.java
View file @
0f5fadef
...
@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
...
@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
import
java.util.List
;
import
java.util.List
;
/*
/*
订单业务数据
lanbm 2024-04-25 add
订单业务数据
*/
*/
@Mapper
@Mapper
public
interface
view_order_businesstimeMapper
{
public
interface
view_order_businesstimeMapper
{
...
@@ -32,7 +32,7 @@ public interface view_order_businesstimeMapper {
...
@@ -32,7 +32,7 @@ public interface view_order_businesstimeMapper {
*/
*/
/*
/*
获取订单业务数据
lanbm 2024-04-25
获取订单业务数据
*/
*/
List
<
view_order_businesstime
>
getOrderBusinessData
();
List
<
view_order_businesstime
>
getOrderBusinessData
();
}
}
yudao-module-delivery/yudao-module-delivery-rest/src/main/resources/mapper/CustomerAnalysisMapper.xml
View file @
0f5fadef
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
and type in ${customerrolestrs}
and type in ${customerrolestrs}
</if>
</if>
<!--
lanbm 2024-06-24
添加国家多选功能-->
<!-- 添加国家多选功能-->
<if
test=
"countrystr!=null and countrystr!=''"
>
<if
test=
"countrystr!=null and countrystr!=''"
>
and c.country= #{countrystr}
and c.country= #{countrystr}
</if>
</if>
...
...
yudao-module-shipment/yudao-module-shipment-rest/src/main/java/cn/iocoder/yudao/module/shipment/controller/admin/MakeBillOfLadingController.java
View file @
0f5fadef
...
@@ -239,7 +239,7 @@ public class MakeBillOfLadingController {
...
@@ -239,7 +239,7 @@ public class MakeBillOfLadingController {
}
}
/*
/*
lanbm 2024-05-07
修改报关价显示单位问题
修改报关价显示单位问题
*/
*/
@GetMapping
(
"/make"
)
@GetMapping
(
"/make"
)
@ApiOperation
(
"制作提货单"
)
@ApiOperation
(
"制作提货单"
)
...
...
yudao-module-wealth/yudao-module-wealth-rest/src/main/java/cn/iocoder/yudao/module/wealth/controller/admin/receiptItem/ReceiptItemController.java
View file @
0f5fadef
...
@@ -157,7 +157,7 @@ public class ReceiptItemController {
...
@@ -157,7 +157,7 @@ public class ReceiptItemController {
/*
/*
获取剩余金额
lanbm 2024-06-10 add
获取剩余金额
*/
*/
private
BigDecimal
getSY
(
ReceiptItemBackVO
v
,
long
id
)
{
private
BigDecimal
getSY
(
ReceiptItemBackVO
v
,
long
id
)
{
Map
<
Integer
,
CurrencyRespDTO
>
currencyMap
=
currencyApi
.
getAllCurrency
();
Map
<
Integer
,
CurrencyRespDTO
>
currencyMap
=
currencyApi
.
getAllCurrency
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment