退款bug修复、新增分类的逻辑删除

leromro-admin/src/main/java/com/leromro/web/controller/system/SysUserController.java

@@ -161,6 +161,9 @@ public class SysUserController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysUser user)
     {
+        if (user.getDeptId() == null){
+            throw new RuntimeException("新增失败，部门为必填项！");
+        }
         deptService.checkDeptDataScope(user.getDeptId());
         roleService.checkRoleDataScope(user.getRoleIds());
         if (!userService.checkUserNameUnique(user))

leromro-core/src/main/java/com/leromro/core/controller/OrgStatDataController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.leromro.common.core.domain.entity.SysDept;
+import com.leromro.common.utils.SecurityUtils;
 import com.leromro.core.domain.Address;
 import com.leromro.core.domain.SecondOrder;
 import com.leromro.core.domain.VolunteerInfo;
@@ -73,6 +74,11 @@ public class OrgStatDataController extends BaseController
     public R<OrderSummaryVO> orderSummary(@RequestBody HomePageDTO dto)
     {
         OrderSummaryVO orderSummaryVO = new OrderSummaryVO();
+        //根据服务中心进行区分
+        SysDept sysDept = deptService.selectDeptById(SecurityUtils.getDeptId());
+        if (sysDept.getAreaType().equals("4")){
+            dto.setDeptId(SecurityUtils.getDeptId());
+        }
         //获取指定时间范围的订单
         List<SecondOrder> list = secondOrderService.getCurrentOrgSecondOrderList(dto);
         //订单总量

leromro-core/src/main/java/com/leromro/core/domain/BusinessManagement.java

@@ -60,5 +60,9 @@ public class BusinessManagement extends BaseEntity
     @TableField("business_icon")
     @ApiModelProperty("分类小图标")
     private String businessIcon;
+    /** 排序 */
+    @TableField("del_flag")
+    @ApiModelProperty("删除标志（0表示存在 2表示删除）")
+    private String delFlag;
 
 }

leromro-core/src/main/java/com/leromro/core/service/impl/OrderRefundServiceImpl.java

@@ -172,9 +172,10 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             this.save(orderRefund);
             return AjaxResult.success("钱款将在三个工作日内返回到您的钱包中");
         } else if (mainOrders.getOrderStatus().equals("3")) {
-            //订单已开始或者订单已完成
+            List<SecondOrder> secondOrderList = secondOrdersMapper.selectList(new LambdaQueryWrapper<SecondOrder>().eq(SecondOrder::getMainOrderId, mainOrderId).eq(SecondOrder::getOrderStatus, "1"));
+            //小订单已开始或者部分小订单已完成
             orderRefund.setStatus("0");
-            orderRefund.setRefundAmount(mainOrders.getServiceOnePrice().multiply(BigDecimal.valueOf(mainOrders.getSingleQuantity())).multiply(new BigDecimal(mainOrders.getTotalTimes() - mainOrders.getFinishTimes())));
+            orderRefund.setRefundAmount(mainOrders.getServiceOnePrice().multiply(BigDecimal.valueOf(mainOrders.getSingleQuantity())).multiply(new BigDecimal(mainOrders.getTotalTimes() - secondOrderList.size())));
             this.save(orderRefund);
             UpdateWrapper<MainOrders> mainOrderUpdateWrapper = new UpdateWrapper<MainOrders>().eq("main_order_id", mainOrderId).set("order_status", "5");
             mainOrdersMapper.update(null, mainOrderUpdateWrapper);
@@ -237,10 +238,11 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         //根据mainID 取出
         MainOrders mainOrder = mainOrdersMapper.selectOne(new LambdaQueryWrapper<MainOrders>().eq(MainOrders::getMainOrderId, mainOrderId));
         OrderRefundVO refundVO = lOrderRefundMapper.selectOrderRefundInfoByMainOrderId(mainOrderId);
-        refundVO.setRefundAmount(refundVO.getServiceOnePrice().multiply(BigDecimal.valueOf(mainOrder.getSingleQuantity())).multiply(new BigDecimal(refundVO.getTotalTimes() - refundVO.getFinishTimes())));
 
         QueryWrapper<SecondOrder> secondOrderQueryWrapper = new QueryWrapper<SecondOrder>().eq("main_order_id", mainOrderId).eq("order_status", "1");
         List<SecondOrder> secondOrderList = secondOrdersMapper.selectList(secondOrderQueryWrapper);
+
+        refundVO.setRefundAmount(refundVO.getServiceOnePrice().multiply(BigDecimal.valueOf(mainOrder.getSingleQuantity())).multiply(new BigDecimal(refundVO.getTotalTimes() - secondOrderList.size())));
         refundVO.setSecondOrder(secondOrderList);
         return refundVO;
     }

leromro-core/src/main/resources/mapper/core/BusinessManagementMapper.xml

@@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="sort"    column="sort"    />
+        <result property="delFlag"    column="del_flag"    />
     </resultMap>
 
     <sql id="selectBusinessManagementVo">
-        select business_management_id, parent_id, ancestors, business_name, business_tier_name,business_icon, create_by, create_time, update_by, update_time, remark, sort from l_business_management
+        select business_management_id, parent_id, ancestors, business_name, business_tier_name,business_icon, create_by, create_time, update_by, update_time, remark, sort ,del_flagfrom l_business_management
     </sql>
 
     <select id="selectBusinessManagementList" parameterType="BusinessManagement" resultMap="BusinessManagementResult">
@@ -36,13 +37,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectBusinessManagementByBusinessManagementId" parameterType="Long" resultMap="BusinessManagementResult">
         <include refid="selectBusinessManagementVo"/>
-        where business_management_id = #{businessManagementId}
+        where business_management_id = #{businessManagementId} and del_flag ='0'
     </select>
     <select id="getTreeList" resultType="com.leromro.core.domain.vo.BusinessManagementVO">
         select business_management_id as id,parent_id,business_name,business_tier_name,business_icon
         from l_business_management
         <where>
             find_in_set(#{parentId},ancestors)
+            and
+            del_flag = '0'
         </where>
         order by sort
     </select>

leromro-core/src/main/resources/mapper/core/MainOrdersMapper.xml

@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>-->
     <update id="startService" parameterType="java.lang.Long">
-        update l_main_orders set order_status = 3 where main_order_id = (select main_order_id from l_second_order where second_order_id = #{secondOrderId});
+        update l_main_orders set order_status = '3' where main_order_id = (select main_order_id from l_second_order where second_order_id = #{secondOrderId});
     </update>
     <select id="selectByUserId" resultType="com.leromro.core.domain.vo.MainOrdersVO">
         select lmo.main_order_id ,lvi.business_tier_name ,lvi.business_describe , lmo.create_time,lmo.service_total_price,lmo.order_status,lvi.name,lvi.volunteer_picture,lmo.create_time

leromro-core/src/main/resources/mapper/core/SecondOrdersMapper.xml

@@ -292,7 +292,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.provinceCode != null">and province_code = #{dto.provinceCode}</if>
             <if test="dto.cityCode != null">and city_code = #{dto.cityCode}</if>
             <if test="dto.districtCode != null">and district_code = #{dto.districtCode}</if>
-            <if test="dto.startDate != null">and create_time >= #{dto.startDate}</if>
+            <if test="dto.startDate != null">and create_time   &gt;= #{dto.startDate}</if>
+         <!--   <if test="dto.startDate != null">and create_time   &lt;= #{dto.startDate+1}</if>-->
+            <if test="dto.deptId != null">and service_center_id = #{dto.deptId}</if>
         </where>
     </select>
     <select id="getTodayAllOrderList" resultType="com.leromro.core.domain.SecondOrder">

leromro-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -175,6 +175,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">remark,</if>
  			<if test="userPlatform != null">user_platform,</if>
  			<if test="areaType != null">area_type,</if>
+ 			<if test="provinceCode != null">province_code,</if>
+ 			<if test="provinceName != null">province_name,</if>
+ 			<if test="cityCode != null">city_code,</if>
+ 			<if test="cityName != null">city_name,</if>
+ 			<if test="districtCode != null">district_code,</if>
+ 			<if test="districtName != null">district_name,</if>
+
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -191,6 +198,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">#{remark},</if>
  		    <if test="userPlatform != null">#{userPlatform},</if>
  		    <if test="areaType != null">#{areaType},</if>
+ 		    <if test="provinceCode != null">#{provinceCode},</if>
+ 		    <if test="provinceName != null">#{provinceName},</if>
+ 		    <if test="cityCode != null">#{cityCode},</if>
+ 		    <if test="cityName != null">#{cityName},</if>
+ 		    <if test="districtCode != null">#{districtCode},</if>
+ 		    <if test="districtName != null">#{districtName},</if>
 		sysdate()
  		)
 	</insert>