diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/InternetUserService.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/InternetUserService.java
index 88d62dbb..fcb31163 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/InternetUserService.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/InternetUserService.java
@@ -1,17 +1,12 @@
package com.xhpc.common.api;
import com.xhpc.common.api.factory.InternetUserFallbackFactory;
-import com.xhpc.common.api.factory.SmsFallbackFactory;
import com.xhpc.common.core.constant.ServiceNameConstants;
import com.xhpc.common.core.domain.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
-import java.util.Map;
-
/**
* @author yuyang
* @date 2021/11/4 11:46
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
index e8f6f926..fa03345b 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
@@ -1315,14 +1315,14 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
map1.put("type",true);
map.put("todayAmount", map1);
}else if (t1==0.0){
- BigDecimal divide2 = new BigDecimal(t2 - t1).divide(new BigDecimal(t1),2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
+ BigDecimal divide2 = new BigDecimal(t2).multiply(new BigDecimal(100));
map1.put("todayAmount",0);
map1.put("yesterdayAmount",t2);
map1.put("weekNumber",divide2);
map1.put("type",false);
map.put("todayAmount", map1);
}else if(t2==0.0){
- BigDecimal divide1 = new BigDecimal(t1 - t2).divide(new BigDecimal(t1),2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
+ BigDecimal divide1 = new BigDecimal(t1).divide(new BigDecimal(t1),2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
map1.put("todayAmount",t1);
map1.put("yesterdayAmount",0);
map1.put("weekNumber",divide1);
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
index 4555032f..9d65e737 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
@@ -30,6 +30,7 @@
+
@@ -111,7 +112,10 @@
operator_id_evcs,
- tenant_id
+ tenant_id,
+
+
+ role_id,
@@ -188,7 +192,10 @@
#{operatorIdEvcs},
- #{tenantId}
+ #{tenantId},
+
+
+ #{roleId},
@@ -202,12 +209,8 @@
contact_phone = #{contactPhone},
open_bank = #{openBank},
card_number = #{cardNumber},
- cooperation_start_time =
- #{cooperationStartTime},
-
- cooperation_end_time =
- #{cooperationEndTime},
-
+ cooperation_start_time = #{cooperationStartTime},
+ cooperation_end_time = #{cooperationEndTime},
balance = #{balance},
area_code = #{areaCode},
address = #{address},
@@ -224,6 +227,7 @@
update_time = #{updateTime},
remark = #{remark},
operator_id_evcs = #{operatorIdEvcs}
+ role_id = #{roleId}
WHERE internet_user_id = #{internetUserId}
@@ -242,7 +246,7 @@
xiu.cooperation_start_time cooperationStartTime, xiu.cooperation_end_time cooperationEndTime,
xiu.balance, xiu.area_code areaCode, xiu.address, xiu.detailed_address detailedAddress,
xiu.commission_type commissionType, xiu.commission_rate commissionRate,
- xiu.longitude, xiu.latitude, xiu.`status`,
+ xiu.longitude, xiu.latitude, xiu.`status`, xiu.`role_id` roleId,
xiu.create_by createBy ,xiu.create_time createTime,
xiu.update_time updateTime, xiu.update_by updateBy,
xiu.del_flag delflag, xiu.remark ,