|
@@ -123,7 +123,7 @@ public class CmPayShopController extends BaseController {
|
|
|
public String saveChangePayShopAmount(NewShopOrder newShopOrder) {
|
|
|
String shopOrderID = newShopOrder.getId();
|
|
|
Double freight = newShopOrder.getShopPostFee();
|
|
|
- Double thirdPartyFee = newShopOrder.getShopOtherFee();
|
|
|
+ Double thirdPartyFee = newShopOrder.getShopOtherFee() == null ? 0d : newShopOrder.getShopOtherFee();
|
|
|
String costType = newShopOrder.getCostType();
|
|
|
Double proportional = newShopOrder.getProportional();
|
|
|
if (null == proportional) {
|