销售合同

trade-client/src/main/java/com/trade/client/trade/salescontract/service/impl/SalesServiceImpl.java

@@ -839,8 +839,8 @@ public class SalesServiceImpl implements SalesService {
                     ContractTermsExtend titleInfo = titleInfos.get(0);
                     contractTemplateDto
                             .setTitleInfo("     " + titleInfo.getTermTitle() + "，" + titleInfo.getContent() + "。");
-                    String titleInfoEn = getEnValues(titleInfo.getI18n(), "titleInfo");
-                    String contentEn = getEnValues(titleInfo.getI18n(), "titleInfo");
+                    String titleInfoEn = getEnValues(titleInfo.getI18n(), "termTitle");
+                    String contentEn = getEnValues(titleInfo.getI18n(), "content");
                     contractTemplateDto.setTitleInfoEn("\n    " + titleInfoEn + "," + contentEn + ".");
                 } else {
                     StringBuffer title = new StringBuffer();

trade-service/src/main/java/com/trade/service/trade/salesorder/service/impl/SalesOrderServiceImpl.java

@@ -385,7 +385,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                             orderStatus = SaleOrderConstant.ORDER_STATUS_PARTIALLY_COMPLETED;
                             flag = 2;
                         }
-                        if (count.equals(salesOrderReceivePaymentDto.getSalesOrderGoodsIds().size())) {
+                        if (count == salesOrderReceivePaymentDto.getSalesOrderGoodsIds().size()) {
                             orderStatus = SaleOrderConstant.ORDER_STATUS_REPAYMENT_UNDER_REVIEW;
                             if (!source) {
                                 orderStatus = SaleOrderConstant.ORDER_STATUS_END;