yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改流量方管理

Browse Source
This commit is contained in:
yuyang 2022-04-22 13:57:44 +08:00
parent 1e323f7498
commit 92bf282038
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/InternetUserService.java
View File

@ -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

4
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
View File

@ -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);

22
xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
View File

@ -30,6 +30,7 @@
<result column="update_time" property="updateTime"/>
<result column="remark" property="remark"/>
<result column="operator_id_evcs" property="operatorIdEvcs"/>
<result column="role_id" property="roleId"/>
</resultMap>
@ -111,7 +112,10 @@
operator_id_evcs,
</if>
<if test="null != tenantId and '' != tenantId">
tenant_id
tenant_id,
</if>
<if test="null != roleId">
role_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -188,7 +192,10 @@
#{operatorIdEvcs},
</if>
<if test="null != tenantId and '' != tenantId">
#{tenantId}
#{tenantId},
</if>
<if test="null != roleId">
#{roleId},
</if>
</trim>
</insert>
@ -202,12 +209,8 @@
<if test="null != contactPhone and '' != contactPhone">contact_phone = #{contactPhone},</if>
<if test="null != openBank and '' != openBank">open_bank = #{openBank},</if>
<if test="null != cardNumber and '' != cardNumber">card_number = #{cardNumber},</if>
<if test="null != cooperationStartTime">cooperation_start_time =
#{cooperationStartTime},
</if>
<if test="null != cooperationEndTime">cooperation_end_time =
#{cooperationEndTime},
</if>
<if test="null != cooperationStartTime">cooperation_start_time = #{cooperationStartTime},</if>
<if test="null != cooperationEndTime">cooperation_end_time = #{cooperationEndTime}, </if>
<if test="null != balance ">balance = #{balance},</if>
<if test="null != areaCode and '' != areaCode">area_code = #{areaCode},</if>
<if test="null != address and '' != address">address = #{address},</if>
@ -224,6 +227,7 @@
<if test="null != updateTime">update_time = #{updateTime},</if>
<if test="null != remark and '' != remark">remark = #{remark},</if>
<if test="null != operatorIdEvcs and '' != operatorIdEvcs">operator_id_evcs = #{operatorIdEvcs}</if>
<if test="null != roleId">role_id = #{roleId}</if>
</set>
WHERE internet_user_id = #{internetUserId}
</update>
@ -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 ,