bug fixes

src/main/java/com/caimei/modules/order/service/CmPayShopService.java

@@ -160,15 +160,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                     Integer returnNum = newOrderProductDao.CountReturnedPurchaseProduct(so.getShopOrderID(), p.getOrderProductID());
                     returnNum = returnNum == null ? 0 : returnNum;
                     p.setReturnedNum(returnNum);
-                    /*if ( returnNum!=null && returnNum>0 ){
-                        if (p.getPresentNum()>0) {
-                            p.setNum(0);
-                            p.setPresentNum(0);
-                        } else {
-                            p.setNum(p.getNum()-returnNum);
-                        }
-                    }
-                    p.setReturnedNum(returnNum == null ? 0 : returnNum > 0 ? returnNum : 0);*/
                 }
                 so.setNewOrderProducts(orderProductList);
                 so.setWaitPayShop((so.getShouldPayShopAmount() == null ? 0D : so.getShouldPayShopAmount()) - (so.getPayedShopAmount() == null ? 0D : so.getPayedShopAmount()));
@@ -180,6 +171,8 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                     if ("2".equals(newOrder.getOrderType())) {
                         //呵呵商城订单
                         so.setOrderType(2);
+                        String name = heHeNewOrderDao.findHeUser(newOrder.getUserID());
+                        so.setClubName(name);
                     }
                 } else {
                     so.setReceiptStatus("1");

src/main/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -272,6 +272,8 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
                 if ("2".equals(newOrder.getOrderType())) {
                     //呵呵商城订单
                     so.setOrderType(2);
+                    String name = heHeNewOrderDao.findHeUser(newOrder.getUserID());
+                    so.setClubName(name);
                 }
             } else {
                 so.setReceiptStatus("1");