Merge remote-tracking branch 'remotes/origin/developer' into developerB

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

@@ -797,7 +797,8 @@ public class CmPayShopController extends BaseController {
         ChangePayShopOther payShopOther = cmPayShopService.shopOtherFeeForm(shopOrderId);
         payShopOther.setShopOrderId(shopOrderId);
         NewShopOrder shopOrder = newShopOrderService.findByShopOrderID(shopOrderId);
-        payShopOther.setShopOtherFee(BigDecimal.valueOf(shopOrder.getShopOtherFee()));
+        double ShopOtherFee = shopOrder.getShopOtherFee() == null ? 0d : shopOrder.getShopOtherFee();
+        payShopOther.setShopOtherFee(BigDecimal.valueOf(ShopOtherFee));
         Double brokerage = shopOrder.getBrokerage();
         brokerage = brokerage == null ? 0d : brokerage;
         model.addAttribute("brokerage", brokerage);