订单支付状态

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderBillSheetServiceImpl.java

@@ -178,7 +178,7 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
             else if(goods.getGoodsRealPrice().compareTo(goods.getGoodsReceived()) == 0){
                 //完全收费
                 goods.setPayStatus(OrderGoods.PAY_FULL);
-                order = this.updateOrderGoodsPAY_FULL(order,goods.getGoodsId());  //订单判断是否更新为全部支付
+                order = this.updateOrderGoodsPAY_FULL(order,goods.getGoodsId());  //订单支付状态判断是否更新为全部支付
             }
             else{
                 //部分收费
@@ -218,11 +218,11 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
         }
         boolean isAllPayFull = true;//是否全部都是完全支付状态
         for (OrderGoodsVo g : orderGoodsVoList) {
-            if(g.getGoodsId() == goodsId){
+            if(g.getGoodsId().equals(goodsId)){
                 //临时设置为完全收费
                 g.setPayStatus(OrderGoods.PAY_FULL);
             }
-            if(g.getPayStatus()!=OrderGoods.PAY_FULL){
+            if(!g.getPayStatus().equals(OrderGoods.PAY_FULL)){
                 isAllPayFull = false;
             }
         }