Merge remote-tracking branch 'origin/dev' into dev

sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterface.java

@@ -40,7 +40,7 @@ public interface LevelOneServerInterface {
 
     /** 根据当前天时间和appUserId查询订单记录 */
     @RequestMapping("/app/TbOrder/rpc/selectOrderList")
-    public List<OrderDto> selectOrderList(@RequestParam("currDay") Date currDay, @RequestParam("appUserId") Long appUserId);
+    public List<OrderDto> selectOrderList(@RequestParam("appUserId") Long appUserId);
 
     @RequestMapping("/TbPeople/rpc/getPeopleList")
     public List<PeopleDto> getPeopleList(@RequestParam("groupId")Long groupId);

sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterfaceFallback.java

@@ -7,6 +7,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -51,10 +52,10 @@ public class LevelOneServerInterfaceFallback implements FallbackFactory<LevelOne
             }
 
             @Override
-            public List<OrderDto> selectOrderList(Date currDay, Long appUserId) {
+            public List<OrderDto> selectOrderList( Long appUserId) {
                 System.out.println(throwable.getMessage());
-                log.error("查询一级市场订单列表错误,当前日:{},当前用户ID:{},错误信息是:{}",currDay,appUserId,throwable.getMessage());
-                return null;
+                log.error("查询一级市场订单列表错误,当前用户ID:{},错误信息是:{}",appUserId,throwable.getMessage());
+                return new ArrayList<>();
             }
 
             @Override

sp-core/sp-api/src/main/java/com/pj/api/consts/FeignFactory.java

@@ -54,7 +54,7 @@ public class FeignFactory {
 	 */
 	public static LevelTwoServerInterface levelTwoServerInterface;
 	@Autowired
-	public static void setLevelTwoServerInterface(LevelTwoServerInterface levelTwoServerInterface) {
+	public void setLevelTwoServerInterface(LevelTwoServerInterface levelTwoServerInterface) {
 		FeignFactory.levelTwoServerInterface = levelTwoServerInterface;
 	}
 }

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/MethodGoodsTransitService.java

@@ -49,7 +49,7 @@ public class MethodGoodsTransitService {
 
 
     /**
-     * 给边民组组员发送短信通知
+     * todo:给边民组组员发送短信通知
      */
     public int sendSms(List<TbPeople> peopleIdList) {
         Map<String,Object> param = new HashMap<>();

sp-service/level-one-server/src/main/java/com/pj/tb_order/MethodOrderService.java

@@ -53,7 +53,7 @@ public class MethodOrderService {
                 so.put("enterpriseId",fk);
                 break;
             default:
-                throw new RuntimeException("服务器繁忙~");
+                throw new ServiceException("服务器繁忙~");
         }
         so.put("deleteStatus",DeleteStatus.DELETE_STATUS_ON.getCode());
         so.put("sortType",44);
@@ -63,7 +63,7 @@ public class MethodOrderService {
     }
 
     /**
-     * 给互助组下属所有人发送取消的message
+     * 给互助组下属所有人发送message
      * @param groupId  边民组ID
      * @param peopleName 边民表的边民名称
      * @param flag true=下单情况下发送message , false=取消订单时发送message
@@ -82,7 +82,7 @@ public class MethodOrderService {
             dto.setUrl("/pages/market/one/merchant/order/list");
             dto.setUserId(item);
             if(flag){
-                dto.setContents("你的购买的商品已被组长 <<" + peopleName + ">> 下单,请往app内进行查看。");
+                dto.setContents("你的组长 <<" + peopleName + ">> 已在app内完成下单,请前往查看。");
             }else {
                 dto.setContents("你的购买的商品已被 <<" + peopleName + ">> 取消,请往app内进行查看。");
             }

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderAppController.java

@@ -115,10 +115,10 @@ public class TbOrderAppController {
 
 	/*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/
 
-	/** 改 转售状态：根据订单Id把订单改为已转售 */
+	/** 查询当天的下单记录 */
 	@RequestMapping("rpc/selectOrderList")
-	public List<OrderDto> selectOrderList(@RequestParam("currDay") Date currDay, @RequestParam("appUserId") Long appUserId) {
-		List<OrderDto> orderDtos = tbOrderService.selectOrderList(currDay,appUserId);
+	public List<OrderDto> selectOrderList( @RequestParam("appUserId") Long appUserId) {
+		List<OrderDto> orderDtos = tbOrderService.selectOrderList(appUserId);
 		return orderDtos;
 	}
 	/** 查 - 根据id查orderDto */

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -264,16 +264,16 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 	}
 
 	/** 远程调用:根据时间和登陆人查询订单 */
-	public List<OrderDto> selectOrderList(Date currDay, Long appUserId){
+	public List<OrderDto> selectOrderList( Long appUserId){
 		//判断当前是否已接单
 		LambdaQueryWrapper<TbOrder> queryWrapper = new LambdaQueryWrapper<>();
 		//根据当天时间查询
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		queryWrapper.eq(TbOrder::getCreateTime,sdf.format(currDay));
+//		queryWrapper.eq(TbOrder::getCreateTime,sdf.format(currDay));
 		queryWrapper.eq(TbOrder::getCreateBy,appUserId);
 		//todo:届时放开该注释
 //		queryWrapper.eq(TbOrder::getApply,ApplyStatus.APPLY_STATUS_ONE.getCode()); //申报通过
 		queryWrapper.eq(TbOrder::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode());
+		queryWrapper.apply("DATE(create_time) = DATE({0})", new Date()); // 匹配当天的数据
 		List<TbOrder> tbOrderList = tbOrderMapper.selectList(queryWrapper);
 		//创建返回值集合
 		List<OrderDto> result = new ArrayList<>();

sp-service/level-two-server/src/main/java/com/pj/tb_demand_quotation/TbDemandQuotationService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.client.level_one_server.LevelOneServerInterface;
 import com.pj.api.dto.MessageDto;
+import com.pj.api.dto.OrderDto;
 import com.pj.api.dto.PeopleDto;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
@@ -21,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -109,11 +111,16 @@ public class TbDemandQuotationService extends ServiceImpl<TbDemandQuotationMappe
      * @param demandQuotationParam
      */
     public boolean quotation(DemandQuotationParam demandQuotationParam) throws Exception {
+
         //获取并判断当前登陆人
         APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
         if (appLoginInfo == null || appLoginInfo.getLoginId() == null)
             throw new ServiceException("当前登录账号信息已失效!");
+        //将需求改成已被报价状态
         demandQuotationParam.setIsOrders(1);
+        //接单前判断组长是否当天在一级市场接单
+        List<OrderDto> dtoList = levelOneServerInterface.selectOrderList(appLoginInfo.getLoginId());
+        if(dtoList.size() != 1)throw new ServiceException("您今天还未在一级市场接单哟~");
         //获取边民组信息
         PeopleDto rpcById = levelOneServerInterface.getRpcById(appLoginInfo.getFk());
         if (rpcById == null) throw new ServiceException("边民组信息有误!");

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/MethodGoodsDemandService.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -127,7 +128,7 @@ public class MethodGoodsDemandService {
         if(updateById == 1){
 
             //关联一级市场订单表 根据创建时间 和 appUserID 进行查询
-            List<OrderDto> orderDtos = levelOneServerInterface.selectOrderList(new Date(), appLoginUserInfo.getLoginId());
+            List<OrderDto> orderDtos = levelOneServerInterface.selectOrderList( appLoginUserInfo.getLoginId());
             if(orderDtos.size() != 1)throw new ServiceException("一级市场暂未接单!");
             //开始创建订单
             TbOrders tbOrders = new TbOrders();