bug fixes

src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -224,7 +224,8 @@ public class CmPayShopController extends BaseController {
             cmChangePayShopRecond.setRemarkImage(substring);
         }
         cmChangePayShopRecondService.save(cmChangePayShopRecond);
-        if (!shopOrder.getShopOtherFee().equals(thirdPartyFee)) {
+        double shopOtherFee = shopOrder.getShopOtherFee() == null ? 0d : shopOrder.getShopOtherFee();
+        if (shopOtherFee != thirdPartyFee) {
             //保存付第三方备注
             ChangePayShopOther payShopOther = new ChangePayShopOther();
             payShopOther.setShopOrderId(newShopOrder.getShopOrderID());