修改退单sku
This commit is contained in:
parent
7da9604c55
commit
6359f9b466
|
|
@ -48,6 +48,8 @@ public interface TbOrderInfoMapper {
|
||||||
|
|
||||||
List<SkuInfoPo> selectSkuByOrderId(String orderId);
|
List<SkuInfoPo> selectSkuByOrderId(String orderId);
|
||||||
|
|
||||||
|
List<SkuInfoPo> selectSkuByOrderIdAndType(String orderId);
|
||||||
|
|
||||||
|
|
||||||
TbOrderInfo selectById(Integer id);
|
TbOrderInfo selectById(Integer id);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -909,11 +909,21 @@ public class OrderService {
|
||||||
orderInfo.setImgUrl("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240223/a04e0d3beef74d099ebd0fd1f7c41873.jpg");
|
orderInfo.setImgUrl("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240223/a04e0d3beef74d099ebd0fd1f7c41873.jpg");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(orderInfo.getOrderType().equals("return")){
|
||||||
|
List<SkuInfoPo> skuInfoPos=tbOrderInfoMapper.selectSkuByOrderIdAndType(orderInfo.getId().toString());
|
||||||
|
if(Objects.isNull(skuInfoPos)||skuInfoPos.size()<0){
|
||||||
|
skuInfoPos=new ArrayList<>();
|
||||||
|
}
|
||||||
|
orderInfo.setSkuInfos(skuInfoPos);
|
||||||
|
}else {
|
||||||
List<SkuInfoPo> skuInfoPos=tbOrderInfoMapper.selectSkuByOrderId(orderInfo.getId().toString());
|
List<SkuInfoPo> skuInfoPos=tbOrderInfoMapper.selectSkuByOrderId(orderInfo.getId().toString());
|
||||||
if(Objects.isNull(skuInfoPos)||skuInfoPos.size()<0){
|
if(Objects.isNull(skuInfoPos)||skuInfoPos.size()<0){
|
||||||
skuInfoPos=new ArrayList<>();
|
skuInfoPos=new ArrayList<>();
|
||||||
}
|
}
|
||||||
orderInfo.setSkuInfos(skuInfoPos);
|
orderInfo.setSkuInfos(skuInfoPos);
|
||||||
|
}
|
||||||
|
|
||||||
orderInfo.setZdNo("POS");
|
orderInfo.setZdNo("POS");
|
||||||
orderInfo.setNames(orderInfo.getProductName() == null ? new String[]{""} : orderInfo.getProductName().split(","));
|
orderInfo.setNames(orderInfo.getProductName() == null ? new String[]{""} : orderInfo.getProductName().split(","));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -610,5 +610,22 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId}
|
||||||
|
|
||||||
<select id="selectById" resultMap="BaseResultMap">
|
<select id="selectById" resultMap="BaseResultMap">
|
||||||
select * from tb_order_info where id=#{id} and status='closed'
|
select * from tb_order_info where id=#{id} and status='closed'
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<select id="selectSkuByOrderIdAndType" resultType="com.chaozhanggui.system.cashierservice.entity.po.SkuInfoPo">
|
||||||
|
SELECT
|
||||||
|
d.product_name AS productName,
|
||||||
|
d.num,
|
||||||
|
d.product_sku_name AS productSkuName,
|
||||||
|
'' AS categoryId,
|
||||||
|
d.price_amount as priceAmount,
|
||||||
|
d.pack_amount as packAmount
|
||||||
|
FROM
|
||||||
|
tb_order_detail d
|
||||||
|
where d.order_id=#{orderId}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue