修改支付信息

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/service/ConfirmOrderService.java

@@ -128,11 +128,14 @@ public class ConfirmOrderService {
 			confirmOrderInfoVo.setItemInfoVoList(itemInfoVoList);
 		}
 
-		confirmOrderInfoVo.setActAmount(confirmOrderInfoVo.getTotalAmount());
+
 		Dictionary dictionary = thirdFeign.findDictionaryByTypeAndCode(DictionaryKey.APP_ORDER, DictionaryKey.SEND_FEE);
 		if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) {
 			confirmOrderInfoVo.setFee(new BigDecimal(dictionary.getDetail()));
 		}
+		if (confirmOrderInfoVo.getFee() != null) {
+			confirmOrderInfoVo.setActAmount(confirmOrderInfoVo.getTotalAmount().add(confirmOrderInfoVo.getFee()));
+		}
 		return ObjectRestResponse.succ(confirmOrderInfoVo);
 	}