user/role/tright 7.10

src/main/java/com/pangding/web/authority/controller/ComputerRegisterController.java

@@ -6,6 +6,7 @@ import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
+import com.yanzuoguang.util.helper.FileHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -13,6 +14,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import java.io.IOException;
 
 /**
  * @Author zhangjinyao
@@ -140,4 +144,8 @@ public class ComputerRegisterController {
         return ResponseResult.result(verifyCode);
     }
 
+    @RequestMapping(value = "/fileUpload",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<String> fileUpload(@RequestBody CommonsMultipartFile file) throws IOException {
+        return ResponseResult.result(registerServiceImpl.fileUpload(file));
+    }
 }

src/main/java/com/pangding/web/authority/service/RegisterService.java

@@ -6,9 +6,11 @@ import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 
 /**
  * @Author zhangjinyao
@@ -79,4 +81,6 @@ public interface RegisterService {
      * @return
      */
     String enterpriceSubmit(EnterpriceSubmitReqVo reqVo);
+
+    String fileUpload(CommonsMultipartFile file) throws IOException;
 }

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

@@ -357,7 +357,43 @@ public class DataServiceImpl implements DataService {
 
     @Override
     public void saveOrderStepOne(OrderStepOneResVo reqVo) {
+        TyyOrderVo tyyOrderVo = reqVo.getTyyOrderVo();
+        TyyOrderMixVo tyyOrderMixVo = reqVo.getTyyOrderMixVo();
+        List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getTyyOrderbackVoList();
+        TyyOrderdetailsVo tyyOrderdetailsVo = reqVo.getTyyOrderdetailsVo();
+        TyyTouristVo tyyTouristVo = reqVo.getTyyTouristVo();
+
+        OrderVo orderVo = new OrderVo();
+        OrderStatusVo orderStatusVo = new OrderStatusVo();
+        OrderRefundVo orderRefundVo = new OrderRefundVo();
+        OrderExtendVo orderExtendVo = new OrderExtendVo();
+        DiscountDetailVo discountDetailVo = new DiscountDetailVo();
+        OrderTicketDetailVo orderTicketDetailVo = new OrderTicketDetailVo();
+        OrderTouristVo orderTouristVo = new OrderTouristVo();
+        if (null != tyyOrderVo){
+            /*pd_order*/
+            orderVo.setId(tyyOrderVo.getId());
+            orderVo.setPid(tyyOrderVo.getPid());
+            orderVo.setOrder_type(tyyOrderVo.getOrder_type());
+            orderVo.setSub_order_type(tyyOrderVo.getSub_order_type());
+            orderVo.setProduct_name(tyyOrderVo.getProduct_name());
+            orderVo.setPlay_date(tyyOrderVo.getPlay_date());
+            orderVo.setUnit_price(tyyOrderVo.getPrice());
+            orderVo.setOrder_num(tyyOrderVo.getOrder_num());
+            orderVo.setTotal_money(tyyOrderVo.getSale_price());
+            orderVo.setDiscount_money(tyyOrderVo.getDiscount_price());
+            orderVo.setPd_discount_money(tyyOrderVo.getDiscount_price());
+            orderVo.setPd_order_money(tyyOrderVo.getReal_price());
+            orderVo.setCost_price(tyyOrderVo.getSettlement_price());
+            orderVo.setCost_total_money(tyyOrderVo.getCost_price());
+            orderVo.setOrder_money(orderVo.getCost_total_money()-orderVo.getDiscount_money());
+            orderVo.setOrder_fee(tyyOrderVo.getOrder_poundage_price());
+            orderVo.setRefund_num(tyyOrderVo.getReturn_num());
+            orderVo.setRefund_money(tyyOrderVo.getReturn_money());
+            orderVo.setPd_refund_money(tyyOrderVo.getReturn_money());
+            orderVo.setOrder_time(tyyOrderVo.getCreate_date());
 
+        }
     }
 
 }

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

@@ -22,10 +22,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -543,4 +546,12 @@ public class RegisterServiceImpl implements RegisterService {
         companyBankCardDaoImpl.update(companyBankCardVo);
         return reqVo.getVerifyCode();
     }
+
+    @Override
+    public String fileUpload(CommonsMultipartFile file) throws IOException {
+        String path = "C:/" + DateHelper.getNow() + file.getOriginalFilename();
+        File newFile = new File(path);
+        file.transferTo(newFile);
+        return path;
+    }
 }

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

@@ -35,7 +35,7 @@ public class TyyOrderVo {
     /**
      * 订单子类型: 1、扫码购票，2、网络购票，3、自助机购票，4、扫码支付，5、预约
      */
-    private Integer sub_order_type;
+    private String sub_order_type;
     private String product_id;
     /**
      * 产品名称
@@ -171,11 +171,11 @@ public class TyyOrderVo {
         this.order_type = order_type;
     }
 
-    public Integer getSub_order_type() {
+    public String getSub_order_type() {
         return sub_order_type;
     }
 
-    public void setSub_order_type(Integer sub_order_type) {
+    public void setSub_order_type(String sub_order_type) {
         this.sub_order_type = sub_order_type;
     }