提货

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApplyPickServiceImpl.java

@@ -1,10 +1,7 @@
 package com.iamberry.rst.service.approval;
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.approval.ApprovalApplyPick;
-import com.iamberry.rst.core.approval.ApprovalInfo;
-import com.iamberry.rst.core.approval.HistoricalRecord;
-import com.iamberry.rst.core.approval.ProcessInfo;
+import com.iamberry.rst.core.approval.*;
 import com.iamberry.rst.core.order.OrderBatch;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
@@ -74,16 +71,21 @@ public class ApplyPickServiceImpl  implements ApplyPickService {
     @Override
     @Transactional
     public  Integer  save(ApprovalApplyPick  approvalApplyPick, String openid, Map<String, Object> tasknfo){
+        Admin admin = sysMapper.getByOpenid(openid);
+        approvalApplyPick.setAdminId(admin.getAdminId());
+
         Integer flag = applyPickMapper.save(approvalApplyPick);
         if(flag < 1){
             throw new RuntimeException("添加提货失败");
         }
+        for (ApprovalApplyPickItem approvalApplyPickItem:approvalApplyPick.getListApplyPickItem()) {
+            
+        }
         flag = applyPickItemMapper.saveList(approvalApplyPick.getListApplyPickItem());
         if(flag < 1){
             throw new RuntimeException("添加提货项失败");
         }
 
-        Admin admin = sysMapper.getByOpenid(openid);
 
         //添加审批信息
         ApprovalInfo approvalInfo = new ApprovalInfo();

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -96,12 +97,19 @@ public class ApplyPickController {
         ResponseJson rj = ResponseJson.getFAILURE();
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();
 
+        Map<String,Object>  map = verification(approvalApplyPick);
+        boolean flag = (boolean) map.get("status");
+        if(!flag){
+            rj.setResultMsg((String) map.get("msg"));
+            return rj;
+        }
+
         JSONArray jsonArray = JSONArray.fromObject(listApplyPickItemJson);
         List<ApprovalApplyPickItem> listApplyPickItem = (List) JSONArray.toCollection(jsonArray, ApprovalApplyPickItem.class);
         approvalApplyPick.setListApplyPickItem(listApplyPickItem);
-
+        approvalApplyPick.setApplyPickStruts(1);
         //获取审批任务id
-        Map<String, Object> taskinfo = approvalTaskService.salesmanSubmitApply(1);
+        Map<String, Object> taskinfo = approvalTaskService.salesmanSubmitApply(2);
         try{
           applyPickService.save(approvalApplyPick,openId,taskinfo);
         }catch (Exception e){
@@ -113,4 +121,29 @@ public class ApplyPickController {
         return rj;
     }
 
+    /**
+     * 验证提货申请
+     * @param approvalApplyPick
+     * @return
+     */
+    public Map<String,Object> verification(ApprovalApplyPick approvalApplyPick){
+        Map<String,Object> map = new HashMap<>();
+        map.put("status",false);
+        if(approvalApplyPick.getApplyPickName() == null || "".equals(approvalApplyPick.getApplyPickName())){
+            map.put("msg","姓名为空");
+            return map;
+        }
+        if(approvalApplyPick.getApplyPickTel() == null || "".equals(approvalApplyPick.getApplyPickTel())){
+            map.put("msg","电话号码为空");
+            return map;
+        }
+        if(approvalApplyPick.getApprovalId() == null || "".equals(approvalApplyPick.getApprovalId())){
+            map.put("msg","审批订单信息id");
+            return map;
+        }
+        map.put("status",true);
+        map.put("msg","success");
+        return map;
+    }
+
 }