Merge remote-tracking branch 'origin/master'

hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java

@@ -67,6 +67,7 @@ public class PayFlow extends FlowDelegate {
     public Long start(Long flowId, JSONObject submitData) {
         Pay pay = submitData.toJavaObject(Pay.class);
 
+        pay.setCurrency("CNY");
         pay.setStatus(PayStatusEnum1.UNDER_REVIEW.getKey());
         payService.save(pay);
 

hx-sale/src/main/java/com/fjhx/sale/entity/sample/po/SampleProduct.java

@@ -79,4 +79,10 @@ public class SampleProduct extends BasePo {
     @TableField(exist = false)
     private List<ObsFile> fileList;
 
+    /**
+     * 商品中文名称
+     */
+    @TableField(exist = false)
+    private String productNameCn;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -38,6 +38,7 @@ import com.fjhx.sale.entity.sample.po.SampleProduct;
 import com.fjhx.sale.entity.sample.po.SampleProject;
 import com.fjhx.sale.entity.sample.po.SampleShipment;
 import com.fjhx.sale.entity.sample.vo.SamplePdfInfoVo;
+import com.fjhx.sale.entity.sample.vo.SampleProductVo;
 import com.fjhx.sale.entity.sample.vo.SampleShipmentVo;
 import com.fjhx.sale.entity.sample.vo.SampleVo;
 import com.fjhx.sale.mapper.sample.SampleMapper;
@@ -181,8 +182,9 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
 
     @Override
     public SampleVo detail(Long id) {
-        Sample Sample = this.getById(id);
-        SampleVo result = BeanUtil.toBean(Sample, SampleVo.class);
+        Sample sample = this.getById(id);
+        Assert.notEmpty(sample,"查询不到样品单信息");
+        SampleVo result = BeanUtil.toBean(sample, SampleVo.class);
         //赋值模板名称
         ContractTemplate contractTemplate = contractTemplateService.getById(result.getContractTemplateId());
         if(ObjectUtil.isNotEmpty(contractTemplate)) {
@@ -213,6 +215,9 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
 
         //赋值产品信息
         List<SampleProduct> sampleProductList = sampleProductService.list(q -> q.eq(SampleProduct::getSampleId, result.getId()));
+        productInfoService.attributeAssign(sampleProductList,SampleProduct::getProductId,(item,product)->{
+            item.setProductNameCn(product.getName());
+        });
         result.setSampleProductList(sampleProductList);
         //赋值其他费用
         List<SampleProject> sampleProjectList = sampleProjectService.list(q -> q.eq(SampleProject::getSampleId, result.getId()));