|
@@ -20,8 +20,6 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.security.NoSuchAlgorithmException;
|
|
|
-import java.security.spec.InvalidKeySpecException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
|
|
@@ -918,10 +916,10 @@ public class PayServiceImpl implements PayService {
|
|
|
BigDecimal paidAmount = payDao.findPaidShop(shopOrderId);
|
|
|
BigDecimal paidShop = MathUtil.add(paidAmount, splitAmount);
|
|
|
if (MathUtil.compare(shopOrder.getShouldPayShopAmount(), paidShop) == 0) {
|
|
|
+ payStatus = "3";
|
|
|
+ } else {
|
|
|
payStatus = "2";
|
|
|
isPay = false;
|
|
|
- } else {
|
|
|
- payStatus = "3";
|
|
|
}
|
|
|
//修改子订单付款状态及付款金额
|
|
|
payDao.updateShopOrderByPayStatus(shopOrderId, paidShop, payStatus);
|