ufo / ufo-platform · Commits

Go to a project

Authored by qinchao
Commit a4d810a5185c1c6ed2e301fb40e4cf8fe96d53a8 1 parent 0e9547e6

质检

Inline Side-by-side
Showing 5 changed files with 30 additions and 8 deletions
... ... @@ -3,6 +3,8 @@ package com.yoho.order.dal;
import com.yoho.order.model.QualityCheck;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface QualityCheckMapper {
int deleteByPrimaryKey(Integer id);
... ... @@ -17,4 +19,5 @@ public interface QualityCheckMapper {
int updateByPrimaryKey(QualityCheck record);
QualityCheck selectByOrderCode(@Param("orderCode") Long orderCode);
List<QualityCheck> selectByOrderCodeList(@Param("orderCodeList") List<String> orderCodeList);
}
\ No newline at end of file
... ...
... ... @@ -18,6 +18,15 @@
from quality_check where order_code = #{orderCode}
</select>
<select id="selectByOrderCodeList" resultMap="BaseResultMap">
select <include refid="Base_Column_List" />
from quality_check
where order_code in
<foreach collection="orderCodeList" item="orderCode" open="(" close=")" separator=",">
#{orderCode}
</foreach>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
... ...
... ... @@ -19,7 +19,7 @@ public enum Constant {
BUYER_ORDER_STATUS_JUDGING((byte)3,"平台鉴定中"),
//平台鉴定通过
BUYER_ORDER_STATUS_JUDGE_PASS((byte)32,"平台鉴定通过"),
//BUYER_ORDER_STATUS_JUDGE_PASS((byte)32,"平台鉴定通过"),
//待收货
BUYER_ORDER_STATUS_TO_BE_RECEIVED((byte)4,"平台已发货"),
... ...
... ... @@ -192,15 +192,21 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
return null;
}
//查询质检情况
//查询buyer_order_goods
List<String> buyerOrderCodeList = orderList.stream().map(BuyerOrder::getOrderCode).collect(Collectors.toList());
List<BuyerOrderGoods> buyerGoodsList = buyerOrderGoodsMapper.selectByOrderCode(buyerOrderCodeList);
if(CollectionUtils.isEmpty(buyerGoodsList)) {
return null;
}
//查询质检情况
List<QualityCheck> qualityCheckList = qualityCheckMapper.selectByOrderCodeList(buyerOrderCodeList);
Map<Long, QualityCheck> qualityCheckMap = null;
if(CollectionUtils.isNotEmpty(qualityCheckList)){
qualityCheckMap = qualityCheckList.stream().collect(Collectors.toMap(QualityCheck::getOrderCode, b->b));
}
Map<String, BuyerOrderGoods> buyerGoodsMap = buyerGoodsList.stream().collect(Collectors.toMap(BuyerOrderGoods::getOrderCode, b->b));
//查询seller_order_goods
... ... @@ -243,7 +249,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
List<ExpressCompany> companyList = expressCompanyMapper.selectByIdList(expressCompanyIdList);
companyMap = companyList.stream().collect(Collectors.toMap(ExpressCompany::getId, ExpressCompany::getCompanyName));
}
List<BuyerOrderResp> respList = convertToResp(orderList, buyerGoodsMap, sellerOrderMap, sellerGoodsMap,expressRecordMap, platformExpressRecordMap, companyMap,skupProductCodeMap);
List<BuyerOrderResp> respList = convertToResp(orderList, buyerGoodsMap, sellerOrderMap, sellerGoodsMap,expressRecordMap, platformExpressRecordMap, companyMap,skupProductCodeMap,qualityCheckMap);
completeMp4VedioUrl(respList); // 查询是否有视频连接
... ... @@ -1251,7 +1257,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
private List<BuyerOrderResp> convertToResp(List<BuyerOrder> orderList, Map<String, BuyerOrderGoods> buyerGoodsMap,
Map<Integer, SellerOrder> sellerOrderMap, Map<Integer, SellerOrderGoods> sellerGoodsMap, Map<String, ExpressRecord> expressInfoMap,
Map<String, ExpressRecord> platformExpressRecordMap, Map<Integer, String> companyMap,Map<Integer, String> skupProductCodeMap ){
Map<String, ExpressRecord> platformExpressRecordMap, Map<Integer, String> companyMap,Map<Integer, String> skupProductCodeMap,Map<Long, QualityCheck> qualityCheckMap ){
List<BuyerOrderResp> respList = Lists.newArrayList();
for(BuyerOrder item : orderList) {
if(null == buyerGoodsMap.get(item.getOrderCode())) {
... ... @@ -1285,6 +1291,12 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
String companyName = companyMap.get(logisticsType);
resp.setPlatformWaybillCode(platformWaybillCode + "(" + companyName + ")");
}
if(qualityCheckMap!=null&&qualityCheckMap.get(Long.valueOf(item.getOrderCode()))!=null){
QualityCheck qualityCheck = qualityCheckMap.get(Long.valueOf(item.getOrderCode()));
resp.setQualityCheckType(qualityCheck.getType()==null?0:qualityCheck.getType().intValue());
resp.setQualityCheckStatus(qualityCheck.getStatus()==null?0:qualityCheck.getStatus().intValue());
}
respList.add(resp);
}
... ... @@ -1349,8 +1361,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
);
case 8:
return Lists.newArrayList(Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal());
case 9:
return Lists.newArrayList(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal());
default:
return Lists.newArrayList();
}
... ...
... ... @@ -26,8 +26,8 @@
<li><a href="javascript:switchOrderStatus(1);">待买家付款(<span id="num_1"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(2);">待卖家发货(<span id="num_2"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(3);">卖家已发货(<span id="num_3"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(4);">平台鉴定中(<span id="num_4"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(8);">平台质检中(<span id="num_8"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(4);">平台鉴定中(<span id="num_4"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(5);">平台已发货(<span id="num_5"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(6);">订单完成(<span id="num_6"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(7);">已取消(<span id="num_7">)</span>)</a></li>
... ...