From 731ccdc2b431ca176942daa1bdb0e752ac9bd4f5 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 18 九月 2024 10:40:12 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OpenController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index d1a2ce2..f82d113 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -5,23 +5,29 @@ import com.core.annotations.AppAuth; import com.core.common.*; import com.core.exception.CoolException; +import com.zy.asrs.entity.LocOwner; import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.param.*; import com.zy.asrs.entity.result.StockVo; +import com.zy.asrs.service.LocOwnerService; import com.zy.asrs.service.OpenService; import com.zy.asrs.service.OrderDetlService; import com.zy.asrs.service.OrderService; import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; +import com.zy.system.entity.User; +import com.zy.system.service.UserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.security.acl.Owner; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * Created by vincent on 2022/4/8 @@ -42,6 +48,30 @@ private OrderService orderService; @Autowired private OrderDetlService orderDetlService; + @Autowired + private LocOwnerService locOwnerService; + @Autowired + private UserService userService; + + + @PostMapping("/order/getInformation/notFinished") + @AppAuth(memo = "璁㈠崟鏈畬鎴愪俊鎭煡璇�") + public synchronized R orderInformationSelect(@RequestHeader(required = false) String appkey, + @RequestBody(required = false) Map<String,String> param, + HttpServletRequest request) + { + auth(appkey, param, request); + String name = param.get("name"); + if (Cools.isEmpty(param)) { + return R.parse(BaseRes.PARAM); + } + User user = userService.selectOne(new EntityWrapper<User>().eq("username", name)); + if (Cools.isEmpty(user)){ + return R.error("鏈壘鍒扮敤鎴�"); + } + List<String> stringList = openService.selectOrderInformation(param); + return R.ok(stringList); + } @PostMapping("/order/matSync/default/v1") @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛") @@ -56,6 +86,32 @@ return R.ok(); } + @PostMapping("/order/ownerSync/default/v1") + @AppAuth(memo = "渚涘簲鍟嗘。妗堝悓姝ユ帴鍙�") + public synchronized R syncOwnerInfo(@RequestHeader(required = false) String appkey, + @RequestBody(required = false) Map<String,String> param, + HttpServletRequest request){ + auth(appkey, param, request); + if (Cools.isEmpty(param)) { + return R.parse(BaseRes.PARAM); + } + + Integer deleteFlag = Integer.parseInt(param.get("deleteFlag")); + + if (deleteFlag == 1){ + locOwnerService.delete(new EntityWrapper<LocOwner>().eq("owner",param.get("owner"))); + }else { + LocOwner locOwner = new LocOwner(); + locOwner.setOwner(param.get("owner")); + locOwner.setPhone(param.get("phone")); + locOwner.setAddr(param.get("addr")); + locOwnerService.insert(locOwner); + } + + + return R.ok(); + } + /** * 娣诲姞鍏ュ簱鍗� */ -- Gitblit v1.9.1