修改

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/task/TaskServiceImpl.java

@@ -34,29 +34,32 @@ public class TaskServiceImpl implements TaskService {
     private TaskMapper taskMapper;
     @Autowired
     private UserMapper userMapper;
+
     @Override
-    public boolean delete(Long id,  Long adminId) throws ServiceException {
+    public boolean delete(Long id, Long adminId) throws ServiceException {
         return taskMapper.deleteById(id) > 0;
     }
 
     @Override
-    public Page<TaskDTO> list(String taskType, Integer page, Integer limit, Long adminId,Long companyId) throws ServiceException {
+    public Page<TaskDTO> list(String taskType, Integer page, Integer limit, Long adminId, Long companyId) throws ServiceException {
         Wrapper<TaskDO> wrapper = new EntityWrapper<TaskDO>();
         if (taskType != null) {
             wrapper.like("task_type", taskType);
         }
-        wrapper.orderBy("gmt_create",false);
-        wrapper.orderBy("gmt_update",false);
-        wrapper.eq("company_id",companyId);
+        wrapper.orderBy("gmt_create", false);
+        wrapper.orderBy("gmt_update", false);
+        wrapper.eq("company_id", companyId);
         List<TaskDO> list = taskMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        List<TaskDTO> taskDTOS=new ArrayList<>();
-        for(TaskDO taskDO : list){
-            TaskDTO taskDTO=new TaskDTO();
-            BeanUtils.copyProperties(taskDO,taskDTO);
-            UserDO userDO=userMapper.selectById(taskDO.getUserId());
-            taskDTO.setUserName(userDO.getUserName());
-            taskDTO.setVueGmtCreate(taskDO.getGmtCreate());
-            taskDTO.setVueGmtUpdate(taskDO.getGmtUpdate());
+        List<TaskDTO> taskDTOS = new ArrayList<>();
+        for (TaskDO taskDO : list) {
+            TaskDTO taskDTO = new TaskDTO();
+            BeanUtils.copyProperties(taskDO, taskDTO);
+            UserDO userDO = userMapper.selectById(taskDO.getUserId());
+            if (userDO != null) {
+                taskDTO.setUserName(userDO.getUserName());
+                taskDTO.setVueGmtCreate(taskDO.getGmtCreate());
+                taskDTO.setVueGmtUpdate(taskDO.getGmtUpdate());
+            }
             taskDTOS.add(taskDTO);
         }
         Integer count = taskMapper.selectCount(wrapper);
@@ -65,37 +68,37 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public TaskDO create(String taskType, String orderNo, Long userId, Long adminId,Long companyId) throws ServiceException {
-         Date now = new Date();
-         TaskDO insertDO = new TaskDO();
-         insertDO.setTaskType(taskType);
-         insertDO.setOrderNo(orderNo);
-         insertDO.setUserId(userId);
-         insertDO.setGmtUpdate(now);
-         insertDO.setGmtCreate(now);
-         insertDO.setCompanyId(companyId);
-         insertDO.setHide(0);
-         if (taskMapper.insert(insertDO) > 0) {
-             return insertDO;
-         }
-         throw new AdminServiceException(ExceptionDefinition.ADMIN_UNKNOWN_EXCEPTION);
+    public TaskDO create(String taskType, String orderNo, Long userId, Long adminId, Long companyId) throws ServiceException {
+        Date now = new Date();
+        TaskDO insertDO = new TaskDO();
+        insertDO.setTaskType(taskType);
+        insertDO.setOrderNo(orderNo);
+        insertDO.setUserId(userId);
+        insertDO.setGmtUpdate(now);
+        insertDO.setGmtCreate(now);
+        insertDO.setCompanyId(companyId);
+        insertDO.setHide(0);
+        if (taskMapper.insert(insertDO) > 0) {
+            return insertDO;
+        }
+        throw new AdminServiceException(ExceptionDefinition.ADMIN_UNKNOWN_EXCEPTION);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String edit(Long id, String taskType, String orderNo, Long userId,  Long adminId,Long companyId) throws ServiceException {
-         Date now = new Date();
-         TaskDO updateDO = new TaskDO();
-         updateDO.setId(id);
-         updateDO.setTaskType(taskType);
-         updateDO.setOrderNo(orderNo);
-         updateDO.setUserId(userId);
-         updateDO.setGmtUpdate(now);
-         updateDO.setCompanyId(companyId);
-         if (taskMapper.updateById(updateDO) > 0) {
-             return "ok";
-         }
-         throw new AdminServiceException(ExceptionDefinition.ADMIN_UNKNOWN_EXCEPTION);
+    public String edit(Long id, String taskType, String orderNo, Long userId, Long adminId, Long companyId) throws ServiceException {
+        Date now = new Date();
+        TaskDO updateDO = new TaskDO();
+        updateDO.setId(id);
+        updateDO.setTaskType(taskType);
+        updateDO.setOrderNo(orderNo);
+        updateDO.setUserId(userId);
+        updateDO.setGmtUpdate(now);
+        updateDO.setCompanyId(companyId);
+        if (taskMapper.updateById(updateDO) > 0) {
+            return "ok";
+        }
+        throw new AdminServiceException(ExceptionDefinition.ADMIN_UNKNOWN_EXCEPTION);
     }
 
 }

unimall-admin/src/views/tradeTotal/tradeTotal.vue

@@ -169,7 +169,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="payFormVisible = false">取消</el-button>
-        <el-button :loading="submiting" type="primary" @click="payData">保存</el-button>
+        <el-button :loading="submiting" type="primary" @click="payData">完成</el-button>
       </div>
     </el-dialog>
     <!-- 补货结转对话框 -->

unimall-admin/src/views/tradeTotal/tradeTotalSale.vue

@@ -128,7 +128,7 @@
       @pagination="getList"
     />
     <!-- 付款对话框 -->
-    <el-dialog :visible.sync="payFormVisible" title="付款">
+    <el-dialog :title="付款" :visible.sync="payFormVisible" :close-on-click-modal="false">
       <el-form
         ref="payForm"
         :rules="rulesPay"
@@ -170,7 +170,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="payFormVisible = false">取消</el-button>
-        <el-button :loading="submiting" type="primary" @click="payData">保存</el-button>
+        <el-button :loading="submiting" type="primary" @click="payData">完成</el-button>
       </div>
     </el-dialog>
   </div>
@@ -227,6 +227,7 @@ export default {
       payForm: {
         id: undefined
       },
+      data: [],
       uploadPath,
       dialogFormVisible: false,
       payFormVisible: false,

unimall-app/config/index.js

@@ -1,7 +1,8 @@
 const dev = {
 	// baseUrl: 'http://127.0.0.1:8080',
 	// baseUrl: 'http://192.168.1.109:8080',
-	baseUrl: 'http://192.168.1.115:8080',
+	// baseUrl: 'http://192.168.1.115:8080',
+	baseUrl: 'http://192.168.1.124:8080',
 	// baseUrl: 'http://192.168.1.113:8080',
 	// baseUrl: 'http://192.168.8.188:8081',
 	// baseUrl: 'https://www.zhuqt.icu',