user/role/tright 7.11

src/main/java/com/pangding/web/authority/service/impl/DataServiceImpl.java

@@ -277,7 +277,11 @@ public class DataServiceImpl implements DataService {
         orderStatusVo.setThird_order_id(tyyOrdersVo.getPiaostorderid());
         orderStatusVo.setProduct_company_id(tyyOrdersVo.getEnterpriseid());
         orderStatusVo.setPayment_id(tyyOrdersVo.getTongl_third_ordersn());
-        orderStatusVo.setIs_summarize(tyyOrdersVo.getEmancipated());
+        if ("N".equals(tyyOrdersVo.getEmancipated())){
+            orderStatusVo.setIs_summarize(0);
+        }else{
+            orderStatusVo.setIs_summarize(1);
+        }
         orderStatusVo.setSummarize_time(tyyOrdersVo.getEmancipated_date());
         orderStatusVo.setDivide_status(tyyOrdersVo.getProfit_checked());
         orderStatusVo.setDivide_time(tyyOrdersVo.getProfit_checked_date());
@@ -434,7 +438,16 @@ public class DataServiceImpl implements DataService {
         orderTouristVo.setPhone(tyyTouristVo.getPhone());
         orderTouristVo.setCredential_type(tyyTouristVo.getCard_type());
         orderTouristVo.setCredential_number(tyyTouristVo.getIdcard());
+        /*若存在则修改，不存在则添加*/
+        OrderTouristGetReqVo orderTouristGetReqVo = new OrderTouristGetReqVo();
+        orderTouristGetReqVo.setOrder_id(tyyTouristVo.getOrdersn());
+        OrderTouristVo orderTouristVo1 = orderTouristDao.load(orderTouristGetReqVo,OrderTouristVo.class);
+        if (null == orderTouristVo1){
             orderTouristDao.create(orderTouristVo);
+        }else {
+            orderTouristVo.setId(orderTouristVo1.getId());
+            orderTouristDao.update(orderTouristVo);
+        }
     }
 
     private void saveOrderRefundVoStepOne(List<TyyOrderbackVo> tyyOrderbackVoList) {
@@ -448,7 +461,15 @@ public class DataServiceImpl implements DataService {
             orderRefundVo.setRefund_fee(tyyOrderbackVo.getRefundFee());
             orderRefundVo.setRefund_amount(tyyOrderbackVo.getReceiveMoney());
             orderRefundVo.setRefund_reason(tyyOrderbackVo.getRefundReason());
+            /*若存在则修改，不存在则添加*/
+            OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo();
+            orderRefundGetReqVo.setId(tyyOrderbackVo.getId());
+            OrderRefundVo orderRefundVo1 = orderRefundDaoImpl.load(orderRefundGetReqVo,OrderRefundVo.class);
+            if (null == orderRefundVo1){
                 orderRefundDaoImpl.create(orderRefundVo);
+            }else{
+                orderRefundDaoImpl.update(orderRefundVo);
+            }
         }
     }
 
@@ -469,7 +490,17 @@ public class DataServiceImpl implements DataService {
         }
         orderTicketDetailVo.setTicket_code(tyyOrderdetailsVo.getLinkid());
         orderTicketDetailVo.setCode_url(tyyOrderdetailsVo.getPicUrl());
+        /*若存在则修改，不存在则添加*/
+        OrderTicketDetailGetReqVo orderTicketDetailGetReqVo = new OrderTicketDetailGetReqVo();
+        orderTicketDetailGetReqVo.setOrder_id(orderTicketDetailVo.getOrder_id());
+        OrderTicketDetailVo orderTicketDetailVo1 = orderTicketDetailDao.load(orderTicketDetailGetReqVo,OrderTicketDetailVo.class);
+        if (null == orderTicketDetailVo1){
             orderTicketDetailDao.create(orderTicketDetailVo);
+        }else {
+            orderTicketDetailVo.setId(orderTicketDetailVo1.getId());
+            orderTicketDetailDao.update(orderTicketDetailVo);
+        }
+
     }
 
     private void saveDiscountDetailVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
@@ -482,7 +513,17 @@ public class DataServiceImpl implements DataService {
             discountDetailVo.setDiscount_money(tyyOrderMixVo.getDiscountprice());
         }
         discountDetailVo.setId(StringHelper.getNewID());
+        /*若存在则修改，不存在则添加*/
+        DiscountDetailGetReqVo discountDetailGetReqVo = new DiscountDetailGetReqVo();
+        discountDetailGetReqVo.setOrder_id(discountDetailVo.getOrder_id());
+        DiscountDetailVo discountDetailVo1 = discountDetailDao.load(discountDetailGetReqVo,DiscountDetailVo.class);
+        if (null == discountDetailVo1){
             discountDetailDao.create(discountDetailVo);
+        }else {
+            discountDetailVo.setId(discountDetailVo1.getId());
+            discountDetailDao.update(discountDetailVo);
+        }
+
     }
 
     private void saveOrderExtendVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
@@ -490,7 +531,17 @@ public class DataServiceImpl implements DataService {
             OrderExtendVo orderExtendVo = new OrderExtendVo();
             orderExtendVo.setId(StringHelper.getNewID());
             orderExtendVo.setOrder_id(tyyOrderVo.getId());
+            /*若存在则修改，不存在则添加*/
+            OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo();
+            orderExtendGetReqVo.setOrder_id(tyyOrderVo.getId());
+            OrderExtendVo orderExtendVo1 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class);
+            if (null == orderExtendVo1){
                 orderExtendDaoImpl.create(orderExtendVo);
+            }else {
+                orderExtendVo.setId(orderExtendVo1.getId());
+                orderExtendDaoImpl.update(orderExtendVo);
+            }
+
         }else if(null != tyyOrderMixVo){
             /*pd_order_extend游玩地址*/
             OrderExtendVo orderExtendAddress = new OrderExtendVo();
@@ -498,14 +549,35 @@ public class DataServiceImpl implements DataService {
             orderExtendAddress.setOrder_id(tyyOrderMixVo.getOrdersn());
             orderExtendAddress.setTitle("游玩地址");
             orderExtendAddress.setContent(tyyOrderMixVo.getPlay_address());
+            /*若存在则修改，不存在则添加*/
+            OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo();
+            orderExtendGetReqVo.setOrder_id(tyyOrderMixVo.getOrdersn());
+            orderExtendGetReqVo.setTitle(orderExtendAddress.getTitle());
+            OrderExtendVo orderExtendAddress1 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class);
+            if (null == orderExtendAddress1){
                 orderExtendDaoImpl.create(orderExtendAddress);
+            }else {
+                orderExtendAddress.setId(orderExtendAddress1.getId());
+                orderExtendDaoImpl.update(orderExtendAddress);
+            }
             /*pd_order_extend游玩时间*/
             OrderExtendVo orderExtendDate = new OrderExtendVo();
             orderExtendAddress.setId(StringHelper.getNewID());
             orderExtendDate.setOrder_id(tyyOrderMixVo.getOrdersn());
             orderExtendDate.setTitle("游玩时间");
             orderExtendDate.setContent(tyyOrderMixVo.getPlay_time());
+            /*若存在则修改，不存在则添加*/
+            OrderExtendGetReqVo orderExtendGetReqVo1 = new OrderExtendGetReqVo();
+            orderExtendGetReqVo.setOrder_id(tyyOrderMixVo.getOrdersn());
+            orderExtendGetReqVo.setTitle(orderExtendDate.getTitle());
+            OrderExtendVo orderExtendDate1 = orderExtendDaoImpl.load(orderExtendGetReqVo1,OrderExtendVo.class);
+            if (null == orderExtendDate1){
                 orderExtendDaoImpl.create(orderExtendDate);
+            }else{
+                orderExtendDate.setId(orderExtendDate1.getId());
+                orderExtendDaoImpl.update(orderExtendDate);
+            }
+
         }
     }
 
@@ -533,7 +605,11 @@ public class DataServiceImpl implements DataService {
             orderStatusVo.setPayment_status(tyyOrderMixVo.getPaystatus());
             orderStatusVo.setOrder_status(tyyOrderMixVo.getOrder_status());
             orderStatusVo.setThird_order_id(tyyOrderMixVo.getPiaostorderid());
-            orderStatusVo.setIs_summarize(tyyOrderMixVo.getEmancipated());
+            if ("N".equals(tyyOrderMixVo.getEmancipated())){
+                orderStatusVo.setIs_summarize(0);
+            }else{
+                orderStatusVo.setIs_summarize(1);
+            }
             orderStatusVo.setSummarize_time(tyyOrderMixVo.getEmancipated_date());
             orderStatusVo.setDivide_status(tyyOrderMixVo.getProfit_checked());
             orderStatusVo.setDivide_time(tyyOrderMixVo.getProfit_checked_date());
@@ -544,7 +620,16 @@ public class DataServiceImpl implements DataService {
             orderStatusVo.setPay_third_id(tyyOrderMixVo.getPay_type_id());
             orderStatusVo.setProduct_company_id(tyyOrderMixVo.getProduct_company_id());
         }
+        /*若存在则修改，不存在则添加*/
+        OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo();
+        orderStatusGetReqVo.setId(orderStatusVo.getId());
+        OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo,OrderStatusVo.class);
+        if (null == orderStatusVo1){
             orderStatusDaoImpl.create(orderStatusVo);
+        }else {
+            orderStatusDaoImpl.update(orderStatusVo);
+        }
+
     }
 
     private void saveOrderVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo, List<TyyOrderbackVo> tyyOrderbackVoList) {
@@ -602,7 +687,16 @@ public class DataServiceImpl implements DataService {
             refundFee += tyyOrderbackVo.getRefundFee();
         }
         orderVo.setRefund_fee(refundFee);
+        /*若存在则修改，不存在则添加*/
+        OrderGetReqVo orderGetReqVo = new OrderGetReqVo();
+        orderGetReqVo.setId(orderVo.getId());
+        OrderVo orderVo1 = orderDaoImpl.load(orderGetReqVo,OrderVo.class);
+        if (null == orderVo1){
             orderDaoImpl.create(orderVo);
+        }else{
+            orderDaoImpl.update(orderVo);
+        }
+
     }
 
 

src/main/java/com/pangding/web/authority/vo/OrderStatusVo.java

@@ -71,7 +71,7 @@ public class OrderStatusVo {
     /**
      * 0未汇总，1已汇总
      */
-    private String is_summarize;
+    private Integer is_summarize;
     /**
      * 汇总时间
      */
@@ -217,11 +217,11 @@ public class OrderStatusVo {
         this.third_order_id = third_order_id;
     }
 
-    public String getIs_summarize() {
+    public Integer getIs_summarize() {
         return is_summarize;
     }
 
-    public void setIs_summarize(String is_summarize) {
+    public void setIs_summarize(Integer is_summarize) {
         this.is_summarize = is_summarize;
     }