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

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -438,8 +438,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
     @Override
     public ContractVo detail(Long id) {
-        Contract Contract = this.getById(id);
-        ContractVo result = BeanUtil.toBean(Contract, ContractVo.class);
+        Contract contract = this.getById(id);
+        Assert.notEmpty(contract, "查询不到合同信息");
+        ContractVo result = BeanUtil.toBean(contract, ContractVo.class);
 
         List<ContractProduct> contractProductList = contractProductService.list(q -> q.eq(ContractProduct::getContractId, id));
         productInfoService.attributeAssign(contractProductList, ContractProduct::getProductId, (item, product) -> {
@@ -458,7 +459,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             item.setProductCode(product.getCode());
         });
         result.setContractShipmentList(contractShipmentList);
-
+        //赋值国省市名称
+        Map<Long, String> areaMapByIds = CustomizeAreaUtil.getAreaMapByIds(Arrays.asList(result.getBuyCountryId(), result.getBuyProvinceId(), result.getBuyCityId()));
+        result.setBuyCountryName(areaMapByIds.get(result.getBuyCountryId()));
+        result.setBuyProvinceName(areaMapByIds.get(result.getBuyProvinceId()));
+        result.setBuyCityName(areaMapByIds.get(result.getBuyCityId()));
         return result;
     }
 

hx-sale/src/main/resources/mapper/pack/PackShipmentMapper.xml

@@ -24,15 +24,17 @@
     </select>
     <select id="productDetailList" resultType="java.util.Map">
         SELECT
-            id  as businessId,
-            remark,
-            null as subDescription,
-            null as customsCode,
-            quantity,
-            null as price,
-            10 as type
+        dg.id AS businessId,
+        json_unquote( pi.standard_json -> '$.englishName' ) remark,
+        dg.product_name AS subDescription,
+        json_unquote ( pi.standard_json -> '$.customsCode' ) AS customsCode,
+        dg.quantity,
+        cp.price AS price,
+        20 AS type
         FROM
-            pack_detail_goods dg
+        pack_detail_product dg
+        LEFT JOIN bytesailing_item.product_info pi ON dg.product_id = pi.id
+        LEFT JOIN contract_product cp ON dg.contract_product_id = cp.id
         <where>
             <include refid="productDetail"/>
         </where>
@@ -53,7 +55,7 @@
     </select>
 
     <sql id="productDetail">
-        <foreach collection="ids" item="id" open="pack_detail_id in(" separator="," close=")">
+        <foreach collection="ids" item="id" open="dg.pack_detail_id in(" separator="," close=")">
             #{id}
         </foreach>
     </sql>