预制卡

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -229,7 +229,7 @@ public class PackageNewClothes {
         order.setCustomerName(customerName);
         order.setCustomerName(customerName);
         order.setContactNumber(contactNumber);
         order.setContactNumber(contactNumber);
         order.setStudenCard(PicturesUtil.uploadPictures(studentCard, orderNum,PATHTYPE));
         order.setStudenCard(PicturesUtil.uploadPictures(studentCard, orderNum,PATHTYPE));
-        order.setIdCardzs(PicturesUtil.uploadPictures(studentCard, orderNum,PATHTYPE));
+        order.setIdCardzs(PicturesUtil.uploadPictures(idCardzs, orderNum,PATHTYPE));
         order.setIdCardz(PicturesUtil.uploadPictures(idCardz, orderNum,PATHTYPE));
         order.setIdCardz(PicturesUtil.uploadPictures(idCardz, orderNum,PATHTYPE));
         order.setIdCardf(PicturesUtil.uploadPictures(idCardf, orderNum,PATHTYPE));
         order.setIdCardf(PicturesUtil.uploadPictures(idCardf, orderNum,PATHTYPE));
         order.setRemarks(remarks);
         order.setRemarks(remarks);

old-user/src/main/java/com/winsun/controller/ChooseController.java

@@ -64,7 +64,7 @@ public class ChooseController {
      * 查询订单详情
      * 查询订单详情
      */
      */
     @RequestMapping(value = "selectOrderInfo", method = RequestMethod.POST)
     @RequestMapping(value = "selectOrderInfo", method = RequestMethod.POST)
-    public ResponseData<Order> selectOrderInfo(@RequestParam(value = "orderid",required = false) String orderId,@RequestParam(value = "orderSeq",required = false) String orderSeq) {
+    public ResponseData<Order> selectOrderInfo(@RequestParam(value = "orderId",required = false) String orderId,@RequestParam(value = "orderSeq",required = false) String orderSeq) {
         try{
         try{
             Wrapper<Order> orderWrapper = new EntityWrapper<>();
             Wrapper<Order> orderWrapper = new EntityWrapper<>();
             if(StringUtils.isBlank(orderSeq)&&StringUtils.isBlank(orderId)){
             if(StringUtils.isBlank(orderSeq)&&StringUtils.isBlank(orderId)){

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -1453,10 +1453,10 @@ public class OrderController extends BaseController {
 
 
     // 保存卡品认证信息
     // 保存卡品认证信息
     public String sendAitransOrder(Map<String, Object> map, int count) throws NoSuchAlgorithmException, UnsupportedEncodingException {
     public String sendAitransOrder(Map<String, Object> map, int count) throws NoSuchAlgorithmException, UnsupportedEncodingException {
-//        HttpHost proxy = new HttpHost("172.18.101.170", 3128);
+        HttpHost proxy = new HttpHost("172.18.101.170", 3128);
         RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(600000).setConnectTimeout(600000)
         RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(600000).setConnectTimeout(600000)
                 .setConnectionRequestTimeout(600000)
                 .setConnectionRequestTimeout(600000)
-//                .setProxy(proxy)
+                .setProxy(proxy)
                 .build();
                 .build();
 
 
         CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
         CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();