diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java
index ea759a92..082ea150 100644
--- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java
+++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java
@@ -738,7 +738,7 @@ public class ShoppingController extends ControllerBase {
         DictionaryItem currency = dictionaryItemService.getByIdAndLanguage(vo.getCurrency(), MultilingualUtil.getLanguage());
         vo.setCurrencyName(currency.getName());
         vo.setDeliveryMethods(shoppingOrderDeliveryMethodService.getList(order.getId()));
-        if (AppUserUtil.isAgent()) {
+        if (order.getCreateByType() == 1) {
             TBaseCustomer customer = customerService.lambdaQuery()
                     .eq(TBaseCustomer::getId, vo.getTargetId())
                     .one();
@@ -1008,6 +1008,7 @@ public class ShoppingController extends ControllerBase {
                     .setReason(request.getReason())
                     .setCreateTime(LocalDateTime.now());
             order.setActualFee(request.getActualFee());
+            order.setDiscount(order.getTotalFee().subtract(request.getActualFee()));
             List<QuotationShoppingOrderAdjustItem> adjustItems = new ArrayList<>();
             request.getItems().forEach(item -> {
                 if (Objects.nonNull(item.getNewStandardFee())) {
@@ -1040,7 +1041,7 @@ public class ShoppingController extends ControllerBase {
         }
         shoppingOrderService.lambdaUpdate()
                 .set(Objects.nonNull(request.getActualFee()), QuotationShoppingOrder::getActualFee, request.getActualFee())
-                .set(Objects.nonNull(request.getActualFee()), QuotationShoppingOrder::getDiscount, order.getTotalFee().subtract(request.getActualFee()))
+                .set(Objects.nonNull(request.getActualFee()), QuotationShoppingOrder::getDiscount, order.getDiscount())
                 .set(QuotationShoppingOrder::getEffectiveEndTime, DateTimeUtil.format(request.getEffectiveEndTime(), "yyyy-MM-dd"))
                 .set(StrUtil.isNotBlank(request.getAddress()), QuotationShoppingOrder::getAddress, request.getAddress())
                 .set(QuotationShoppingOrder::getUpdateTime, LocalDateTime.now())
diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/QuotationPriceUpdateRequest.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/QuotationPriceUpdateRequest.java
index 0c009f55..6c0ee6e8 100644
--- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/QuotationPriceUpdateRequest.java
+++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/QuotationPriceUpdateRequest.java
@@ -19,13 +19,11 @@ public class QuotationPriceUpdateRequest {
     /**
      * 调价后实际总价
      */
-    @NotNull(message = "调价后实际总价不能为空")
     private BigDecimal actualFee;
 
     /**
      * 调价原因
      */
-    @NotBlank(message = "调价原因不能为空")
     private String reason;
 
     /**
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsDataMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsDataMapper.xml
index 407a2ef6..9ed835ee 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsDataMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsDataMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.nflg.mobilebroken.repository.mapper.ProductModelParamsDataMapper">
 
     <select id="getEffectives" resultType="com.nflg.mobilebroken.common.pojo.dto.ModelConfigEffectiveDTO">
-        SELECT pmpd.id,pmpd.parent_id,pmpd.name as part_name,pmpd.remark as part_remark,pmpd.image_url,pp.amount,pmpd.type
+        SELECT pmpd.id,pmpd.parent_id,pmpd.name as part_name,pmpdl.value as part_remark,pmpd.image_url,pp.amount,pmpd.type
              ,pmpd.optional_type,pmpd.group_name
         FROM product_model_params_data pmpd
         LEFT JOIN product_model_params_data_language pmpdl ON pmpdl.params_data_id=pmpd.id