1. 审核用户Bug修复

2. 订单完成时对服务次数递增

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/controller/UserController.java

@@ -113,6 +113,7 @@ public class UserController {
     public Result auditedStaff(@RequestParam("userId") Long id){
         UserDTO userDTO = userService.get(id);
         userDTO.setStatus(101);
+        userService.update(userDTO);
         RoleUserDTO roleUserDTO = new RoleUserDTO();
         roleUserDTO.setUserId(id);
         roleUserDTO.setRoleId(1354991197348798466L);

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/dao/PensionServiceDao.java

@@ -17,4 +17,6 @@ public interface PensionServiceDao extends BaseDao<PensionServiceEntity> {
 
     List<PensionServiceEntity> getAllService();
 
+    void addServiceTime(Long serviceId);
+
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/service/PensionServiceService.java

@@ -19,4 +19,6 @@ public interface PensionServiceService extends CrudService<PensionServiceEntity,
 
     List<PensionServiceDTO> getAllService();
 
+    void addServiceTimes(Long serviceId);
+
 }

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOrderServiceImpl.java

@@ -10,10 +10,7 @@ import io.hmit.modules.serviceOrder.dao.PensionOrderDao;
 import io.hmit.modules.serviceOrder.dto.PensionOrderDTO;
 import io.hmit.modules.serviceOrder.entity.PensionOrderEntity;
 import io.hmit.modules.serviceOrder.entity.UserEntity;
-import io.hmit.modules.serviceOrder.service.PensionOrderService;
-import io.hmit.modules.serviceOrder.service.PensionOrderServiceService;
-import io.hmit.modules.serviceOrder.service.PensionOrganizationService;
-import io.hmit.modules.serviceOrder.service.UserService;
+import io.hmit.modules.serviceOrder.service.*;
 import io.hmit.modules.sys.service.PushMessage;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +36,7 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
     private PensionOrderDao pensionOrderDao;
 
     @Autowired
-    private PensionOrderServiceService pensionOrderServiceService;
+    private PensionServiceService pensionServiceService;
 
     @Autowired
     private PensionOrganizationService pensionOrganizationService;
@@ -140,6 +137,7 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
                 pensionOrderEntity.setStatus(Constant.OrderStatus.WAIT_EVALUATE.geStatus());
                 pensionOrderEntity.setStatusName(Constant.OrderStatus.WAIT_EVALUATE.getMessage());
                 update(ConvertUtils.sourceToTarget(pensionOrderEntity, PensionOrderDTO.class));
+                pensionServiceService.addServiceTimes(pensionOrderEntity.getServiceId());
             }
         }
         return true;

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionServiceServiceImpl.java

@@ -26,9 +26,6 @@ import java.util.Map;
 @Service
 public class PensionServiceServiceImpl extends CrudServiceImpl<PensionServiceDao, PensionServiceEntity, PensionServiceDTO> implements PensionServiceService {
 
-    @Autowired
-    private PensionServiceService pensionServiceService;
-
     @Autowired
     private PensionServiceDao pensionServiceDao;
 
@@ -61,4 +58,13 @@ public class PensionServiceServiceImpl extends CrudServiceImpl<PensionServiceDao
     public List<PensionServiceDTO> getAllService() {
         return ConvertUtils.sourceToTarget(pensionServiceDao.getAllService(), PensionServiceDTO.class);
     }
+
+    @Override
+    public void addServiceTimes(Long serviceId) {
+//        PensionServiceDTO pensionServiceDTO = get(serviceId);
+//        Integer timesNum = pensionServiceDTO.getTimesNum() + 1;
+//        pensionServiceDTO.setTimesNum(timesNum);
+//        update(pensionServiceDTO);
+        pensionServiceDao.addServiceTime(serviceId);
+    }
 }

hmit-admin/src/main/resources/mapper/serviceOrder/PensionServiceDao.xml

@@ -27,4 +27,8 @@
         SELECT * FROM pension_service
     </select>
 
+    <update id="addServiceTime" parameterType="io.hmit.modules.serviceOrder.entity.PensionServiceEntity">
+        update pension_service set times_num = times_num+1 where id = #{serviceId}
+    </update>
+
 </mapper>

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dao/PensionServiceDao.java

@@ -12,5 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PensionServiceDao extends BaseDao<PensionServiceEntity> {
-	
+
+    void addServiceTime(Long serviceId);
+
 }
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/PensionServiceService.java

@@ -16,4 +16,7 @@ import java.util.Map;
 public interface PensionServiceService extends CrudService<PensionServiceEntity, PensionServiceDTO> {
 
     List<PensionServiceDTO> getFirstServiceList(Map<String, Object> params);
+
+    void addServiceTimes(Long serviceId);
+
 }

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOrderServiceImpl.java

@@ -41,7 +41,7 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
         return wrapper;
     }
     @Autowired
-    private RoleService roleService;
+    private PensionServiceService pensionServiceService;
 
     @Autowired
     private PensionOrderDao pensionOrderDao;
@@ -220,11 +220,12 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
             } else {
                 return false;
             }
-        }else if (status == 4) {
+        }else if (status == 4) { //完成订单
             if (pensionOrderEntity.getStatus() == Constant.OrderStatus.ORDER.geStatus()) {
                 pensionOrderEntity.setStatus(Constant.OrderStatus.WAIT_EVALUATE.geStatus());
                 pensionOrderEntity.setStatusName(Constant.OrderStatus.WAIT_EVALUATE.getMessage());
                 update(ConvertUtils.sourceToTarget(pensionOrderEntity, PensionOrderDTO.class));
+                pensionServiceService.addServiceTimes(pensionOrderEntity.getServiceId());
             }
         }
         return true;

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionServiceServiceImpl.java

@@ -8,6 +8,7 @@ import io.hmit.modules.serviceOrder.dto.PensionServiceDTO;
 import io.hmit.modules.serviceOrder.entity.PensionServiceEntity;
 import io.hmit.modules.serviceOrder.service.PensionServiceService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -24,6 +25,9 @@ import java.util.Map;
 @Service
 public class PensionServiceServiceImpl extends CrudServiceImpl<PensionServiceDao, PensionServiceEntity, PensionServiceDTO> implements PensionServiceService {
 
+    @Autowired
+    private PensionServiceDao pensionServiceDao;
+
     @Override
     public QueryWrapper<PensionServiceEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get("id");
@@ -39,7 +43,6 @@ public class PensionServiceServiceImpl extends CrudServiceImpl<PensionServiceDao
         return wrapper;
     }
 
-
     @Override
     public List<PensionServiceDTO> getFirstServiceList(Map<String, Object> params) {
         String isFree = (String)params.get("isFree");
@@ -61,4 +64,13 @@ public class PensionServiceServiceImpl extends CrudServiceImpl<PensionServiceDao
 
         return ConvertUtils.sourceToTarget(pensionServiceLists,PensionServiceDTO.class) ;
     }
+
+    @Override
+    public void addServiceTimes(Long serviceId) {
+//        PensionServiceDTO pensionServiceDTO = get(serviceId);
+//        Integer timesNum = pensionServiceDTO.getTimesNum() + 1;
+//        pensionServiceDTO.setTimesNum(timesNum);
+//        update(pensionServiceDTO);
+        pensionServiceDao.addServiceTime(serviceId);
+    }
 }

hmit-api/src/main/resources/mapper/serviceOrder/PensionServiceDao.xml

@@ -23,5 +23,8 @@
         <result property="updateDate" column="update_date"/>
     </resultMap>
 
+    <update id="addServiceTime" parameterType="io.hmit.modules.serviceOrder.entity.PensionServiceEntity">
+        update pension_service set times_num = times_num+1 where id = #{serviceId}
+    </update>
 
 </mapper>