红德堂-fix:使用优惠券的问诊订单重新支付支付金额异常问题处理

fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderServiceImpl.java

@@ -2039,7 +2039,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
                 data.put("discountMoney", order.getMoney());
             }
         } else {
-            data.put("payMoney", order.getMoney());
+            data.put("payMoney", order.getUserCouponId() == null ? order.getMoney() : order.getPayMoney());
             data.put("discountMoney", new BigDecimal(0));
         }
         return R.ok().put("data", data);

fs-user-app/src/main/java/com/fs/app/controller/InquiryOrderController.java

@@ -236,8 +236,10 @@ public class InquiryOrderController extends  AppBaseController {
                 userCouponService.updateFsUserCoupon(userCoupon);
             }
             else{
-                order.setPayMoney(order.getMoney());
-                order.setDiscountMoney(new BigDecimal(0));
+                if (order.getUserCouponId() == null) {
+                    order.setPayMoney(order.getMoney());
+                    order.setDiscountMoney(new BigDecimal(0));
+                }
             }
             inquiryOrderService.updateFsInquiryOrder(order);
             return R.ok();