Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-server into feature/asyncOrder

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementService.java

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Service: ht_trade_settlement -- 航通交易结算表
@@ -93,54 +94,63 @@ public class HtTradeSettlementService extends ServiceImpl<HtTradeSettlementMappe
 
 
     /**
-     * 远程调用: 添加大订单时同事生成小定单
+     * 远程调用: 添加大订单时同时生成边民订单
      */
     public boolean tradeSettlementDto(TradeSettlementDto tradeSettlementDto) {
         HtTradeSettlement htTradeSettlement = new HtTradeSettlement();
         BeanUtils.copyProperties(tradeSettlementDto, htTradeSettlement);
         int insert = htTradeSettlementMapper.insert(htTradeSettlement);
-        //取出边民小定单集合
+        //获取边民订单集合
         List<BordersListDto> bordersListDtoList = tradeSettlementDto.getBordersListDtoList();
-        BorderBuyGoodsListDto borderBuyGoodsListDto = tradeSettlementDto.getBorderBuyGoodsListDtoList().get(0);
-        TbGoods tbGoods = tbGoodsService.findByCode(borderBuyGoodsListDto.getCodeTs());
+
+        //获取订单商品列表集合
+		List<BorderBuyGoodsListDto> borderBuyGoodsListDtoList = tradeSettlementDto.getBorderBuyGoodsListDtoList();
+
         TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(tradeSettlementDto.getFieldCode(), tradeSettlementDto.getFieldName());
         TbShop tbShop = tbShopService.findByCode(tradeSettlementDto.getShopNo());
-        if (tbShop != null) {
-            tbShop.setEnterpriseId(tbShop.getEnterpriseId())
-                    .setEnterpriseName(tbShop.getEnterpriseName());
-        }
-        //循环
-        if (bordersListDtoList.size() > 0) {
-            bordersListDtoList.forEach(item -> {
-                //开始创建小定单
-                TbOrder tbOrder = new TbOrder();
-                //航通字段
-                BeanUtils.copyProperties(item, tbOrder);
-                //根据身份证查询边民
-                TbPeople tbPeople = tbPeopleService.findByIdCarNo(item.getIdno());
-                tbOrder.setCallCarStatus(CallCarStatus.CALL_CAR_STATUS_ZERO.getCode());
-                tbOrder.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
-                tbOrder.setCreateTime(new Date())
-                        .setTradeNo(SystemObject.getREFcode("YJSCDD", new Date()))
-                        .setTradeAreaId(tbTradeArea.getId()).setTradeAreaName(tbTradeArea.getName());
-                tbOrder.setResaleStatus(ResaleStatus.RESALE_STATUS_ZERO.getCode());
-                tbOrder.setFinishStatus(OrderStatus.ORDER_STATUS_ZERO.getCode());
-                tbOrder.setSend(DeliverStatus.DELIVER_STATUS_ZERO.getCode());
-                tbOrder.setApply(ApplyStatus.APPLY_STATUS_ZERO.getCode());
-                tbOrder.setGoodsId(tbGoods.getId()).setTotalPrice(borderBuyGoodsListDto.getBuyAmount())
-                        .setTotalWeight(borderBuyGoodsListDto.getGrossWt())
-                        .setGoodsNames(tbGoods.getName())
-                        .setGoodsUnit(tbGoods.getUnit());
-                if (tbPeople != null) {
-                    tbOrder.setBuyUserId(tbPeople.getId());
-                    tbOrder.setBuyUserName(tbPeople.getName());
-                    tbOrder.setGroupId(tbPeople.getGroupId());
-                }
-                tbOrder.setPreNo(item.getPreNo());
-
-                tbOrderMapper.insert(tbOrder);
-            });
-        }
+
+		bordersListDtoList.forEach(item -> {
+			//开始创建边民订单
+			TbOrder tbOrder = new TbOrder();
+			//航通字段
+			BeanUtils.copyProperties(item, tbOrder);
+
+			tbOrder.setCreateTime(new Date())
+					.setTradeNo(SystemObject.getREFcode("YJSCDD", new Date()))
+					.setTradeAreaId(tbTradeArea.getId()).setTradeAreaName(tbTradeArea.getName());
+			tbOrder.setTotalWeight(item.getGrossWt()).setTotalPrice(item.getBuyAmount());
+
+			tbOrder.setApply(ApplyStatus.APPLY_STATUS_ONE.getCode());
+			tbOrder.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
+			tbOrder.setResaleStatus(ResaleStatus.RESALE_STATUS_ZERO.getCode());
+			tbOrder.setFinishStatus(OrderStatus.ORDER_STATUS_ZERO.getCode());
+
+			//根据边民身份证号获取边民的订单商品列表(目前逻辑为一个边民对应一个商品)
+			List<BorderBuyGoodsListDto> collect = borderBuyGoodsListDtoList.stream().filter(borderBuyGoods -> item.getIdno().equals(borderBuyGoods.getIdno())).collect(Collectors.toList());
+			if (collect.size() > 0) {
+				//根据商品编号查询商品表
+				TbGoods tbGoods = tbGoodsService.findByCode(collect.get(0).getCodeTs());
+				if(null != tbGoods) {
+					tbOrder.setGoodsId(tbGoods.getId());
+					tbOrder.setGoodsNames(tbGoods.getName());
+					tbOrder.setGoodsUnit(tbGoods.getUnit());
+				}
+			}
+			//根据身份证查询边民
+			TbPeople tbPeople = tbPeopleService.findByIdCarNo(item.getIdno());
+			if (tbPeople != null) {
+				tbOrder.setBuyUserId(tbPeople.getId());
+				tbOrder.setBuyUserName(tbPeople.getName());
+				tbOrder.setBuyUserType(String.valueOf(tbPeople.getRole()));
+				tbOrder.setGroupId(tbPeople.getGroupId());
+			}
+			//商品店铺信息
+			if (tbShop != null)
+				tbOrder.setEnterpriseId(tbShop.getEnterpriseId()).setEnterpriseName(tbShop.getEnterpriseName());
+
+			tbOrderMapper.insert(tbOrder);
+		});
+
         return insert == 1;
     }
 }

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java

@@ -16,6 +16,7 @@ import java.util.Objects;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.dto.AppUserDto;
+import com.pj.api.dto.EnterpriseAuditDto;
 import com.pj.api.dto.MessageDto;
 import com.pj.api.dto.PurchaserDto;
 import com.pj.common.core.exception.ServiceException;
@@ -118,53 +119,30 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 	 * @param judgeContent 审核备注
 	 * @return
 	 */
-	public boolean audit(Long purchaserId,Integer judgeStatus,String judgeContent){
-		//审核不通过
-		if(judgeStatus.equals(JudgeStatus.JUDGE_STATUS_TWO.getCode())){
-			TbPurchaser selectById = tbPurchaserMapper.selectById(purchaserId);
-			if(selectById == null)throw new ServiceException("商户信息异常!");
-			selectById.setJudgeStatus(JudgeStatus.JUDGE_STATUS_TWO.getCode());
-			selectById.setJudgeContent(judgeContent);
-			tbPurchaserMapper.updateById(selectById);
-			//发送通知给收购商
-			MessageDto dto = new MessageDto();
-			dto.setUrl("/pages/market/one/merchant/order/list");
-			dto.setUserId(purchaserId);
-			dto.setContents("您发起的收购商认证审核不通过,原因是: " + judgeContent);
-			adminInterface.messageSave(dto);
-			return true;
-		}
-		if(!judgeStatus.equals(1))
-			return false;
-		//审核通过
+	public boolean audit(Long purchaserId,Integer judgeStatus,String judgeContent) {
 		TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(purchaserId);
-		if(tbPurchaser == null)throw new ServiceException("收购商信息异常。");
-		//审核同构且完成数据插入则进行关联
-		AppUserDto appUser = adminInterface.getByPhoneAndUserType(tbPurchaser.getContact(), UserType.USER_TYPE_PURCHASER.getCode());
-		if(appUser == null)throw new ServiceException("审核的用户的信息异常!");
-		if(appUser.getAuth().equals("1") || appUser.getFkId() != null)
-			throw new ServiceException("该用户认证信息异常。");
-		//设置审核人和审核时间
-		tbPurchaser.setJudgeTime(new Date());
-		tbPurchaser.setPersonId(StpUserUtil.getLoginIdAsString());
-		tbPurchaser.setJudgeStatus(JudgeStatus.JUDGE_STATUS_ONE.getCode());
-		tbPurchaserMapper.updateById(tbPurchaser);
-		//设置关联属性
-		appUser.setFkId(String.valueOf(tbPurchaser.getId()));
-		appUser.setAuth(1 + "");  // 1=审核通过
-		//保存
-		Boolean aBoolean = adminInterface.saveAppUserInfo(appUser);
-		//发送message
-		if(aBoolean){
-			//发送通知给收购商
-			MessageDto dto = new MessageDto();
-			dto.setUserId(appUser.getId());
-			dto.setContents("恭喜商户信息认证成功!");
-			adminInterface.messageSave(dto);
+		if (tbPurchaser == null) {
+			throw new AjaxError("收购商不存在");
+		}
+		String name = StpUserUtil.getLoginName();
+		tbPurchaser.setJudgeStatus(judgeStatus).setJudgeContent(judgeContent).setJudgeTime(new Date()).setJudgeBy(name);
+		if (judgeStatus == 1) {
+			EnterpriseAuditDto auditDto = new EnterpriseAuditDto();
+			auditDto.setAuth("1");
+			auditDto.setFkId(purchaserId);
+			auditDto.setId(Long.parseLong(tbPurchaser.getCreateBy()));
+			if (adminInterface.audit(auditDto)) {
+				//发送通知给收购商
+				MessageDto dto = new MessageDto();
+				dto.setUserId(purchaserId);
+				dto.setContents("恭喜商户信息认证成功!");
+				adminInterface.messageSave(dto);
+				return updateById(tbPurchaser);
+			}
+			throw new ServiceException("审核失败");
 		}
-		return aBoolean;
+		return updateById(tbPurchaser);
 	}
-
 	/** 获取审核状态 */
 	public PurchaserParamVo auditStatus(Long appUserId){
 		List<TbPurchaser> purchaserList = tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getCreateBy, appUserId).orderByDesc(TbPurchaser::getCreateTime));

sp-service/sp-admin/src/main/java/com/pj/project/tb_message/TbMessageAppController.java

@@ -31,11 +31,12 @@ public class TbMessageAppController {
 
     /**
      * app端: 删除消息 (可批量,可单条)
+     *
      * @param ids
      * @return
      */
     @DeleteMapping("deleteByIdList")
-    public AjaxJson deleteByIdList(List<Long> ids){
+    public AjaxJson deleteByIdList(List<Long> ids) {
         tbMessageService.removeByIds(ids);
         return AjaxJson.getSuccess();
     }
@@ -48,7 +49,7 @@ public class TbMessageAppController {
         SoMap so = SoMap.getRequestSoMap();
         so.put("enable", 1);
         if (so.get("types").toString().equals("2")) {
-            so.put("userId", StpAPPUserUtil.getAPPLoginInfo().getFk());
+            so.put("userId", StpAPPUserUtil.getAPPLoginInfo().getFk() == null ? "123" : StpAPPUserUtil.getAPPLoginInfo().getFk());
             tbMessageService.clearRead(StpAPPUserUtil.getAPPLoginInfo().getFk());
         }
         List<TbMessage> list = tbMessageService.getList(so.startPage());