11

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/handler/MiniAlipayLoginHandler.java

@@ -117,9 +117,7 @@ public class MiniAlipayLoginHandler extends AbstractLoginHandler {
             appUser.setCreateBy(openId);
             appUser.setUpdateBy(openId);
             appUserService.saveOrUpdate(appUser);
-            AppUserInfo appUserDTO = new AppUserInfo();
-            appUserDTO.setAppUser(appUser);
-            return appUserDTO;
+            return appUserService.findUserInfo(user);
         }
         return appUserService.findUserInfo(user);
     }

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
+import com.bsd.pjcloud.canteen.constant.OrderTypeEnum;
 import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
@@ -125,6 +126,16 @@ public class HardOrderController {
         return R.ok(hardwareOrderService.pagejoin(page, dto));
     }
 
+    @Operation(summary = "app查询toc自提柜订单", description = "app查询toc自提柜订单")
+    @GetMapping("/app/toc-door-page-join")
+    public R appTocDoorPageJoin(@ParameterObject Page page, @ParameterObject HardOrderDto dto) {
+        PjcloudUser user = SecurityUtils.getUser();
+        dto.setUserId(user.getId());
+        dto.setIsFindCarList(true);
+        dto.setOrderTypeCodes(List.of(HardOrderTypeEnum.TOC_VISITOR.getType()));
+        return R.ok(hardwareOrderService.pagejoin(page, dto));
+    }
+
     @Operation(summary = "app查询食堂订单列表", description = "app查询订单列表")
     @GetMapping("/app/caneen-page-join")
     public R appCaneenPageJoin(@ParameterObject Page page, @ParameterObject HardOrderDto dto) {

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java

@@ -874,6 +874,12 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         Long currentUserId = null;
         Long currentUserDeptId = null;
         Long currentWalletId = null;
+        HardOrderTypeEnum currentOrderType = HardOrderTypeEnum.BELOW;
+        if (ObjectUtil.equals(userType, UserTypeEnum.TOB)) {
+            currentOrderType = HardOrderTypeEnum.BELOW;
+        } else {
+            currentOrderType = HardOrderTypeEnum.TOC_VISITOR;
+        }
         // 查询TOB用户
         if (ObjectUtil.equals(userType, UserTypeEnum.TOB)) {
             UserInfo userDetail = userService.getInnerByUserId(userId).getData();
@@ -907,7 +913,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
                 .userDeptId(currentUserDeptId)
                 .sysType(HardTypeEnum.DOOR.getType())
                 .orderStatus(HardOrderStatusEnum.CREATE.getType())
-                .orderType(HardOrderTypeEnum.BELOW.getType())
+                .orderType(currentOrderType.getType())
                 .payType(HardPayTypeEnum.HARD_DOOR_FREE_PAY.getType())
                 .totalPrice(0)
                 .extraPrice(0)