远程调用 移出订单 查询 订单号

+FROM java:8u111
+
+VOLUME /tmp
+
+ADD *.jar app.jar
+
+EXPOSE 10003
+
+ENTRYPOINT ["java","-jar","/app.jar"]
+
+# Ubuntu 时区
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
\ No newline at end of file

@@ -199,6 +199,25 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>gen-webadmin</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<copy todir="docker" file="target/${project.artifactId}-${project.version}.${project.packaging}" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
 		</plugins>
 	</build>
 

@@ -6,6 +6,7 @@ import com.sunyo.energy.location.model.PayRecords;
 import com.sunyo.energy.location.service.PayOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,8 +25,9 @@ public class PayOrderController {
     @ApiOperation(value = "查询缴费订单")
     @RequestMapping("/list")
     public PageInfo<PayRecords> getOrder(@RequestParam(value = "pageSize", required = false, defaultValue = "1") int pageSize,
-                                         @RequestParam(value = "pageNum", required = false, defaultValue = "5") int pageNum){
-        return payOrderService.getOrder(pageSize, pageNum);
+                                         @RequestParam(value = "pageNum", required = false, defaultValue = "5") int pageNum,
+                                         @RequestParam(value = "orderNumber",required = false) String orderNumber){
+        return payOrderService.getOrder(pageSize, pageNum, orderNumber);
     }
 
 
@@ -61,6 +63,6 @@ public class PayOrderController {
         if(result>0){
             mgs=1;
         }
-        return mgs==1? new ResultJson("200","订单信息删除成功"):new ResultJson("500","订单信息删除失败");
+        return mgs==1? new ResultJson("200","订单信息移出成功"):new ResultJson("500","订单信息删除失败");
     }
 }

 package com.sunyo.energy.location.dao;
 
 import com.sunyo.energy.location.model.PayRecords;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,5 +18,5 @@ public interface PayRecordsMapper {
 
     int updateByPrimaryKey(PayRecords record);
 
-    List<PayRecords> findAll();
+    List<PayRecords> findAll(@Param(value = "orderNumber") String orderNumber);
 }
\ No newline at end of file

@@ -7,7 +7,7 @@ import com.sunyo.energy.location.model.PayRecords;
  * Created by XYH on 2019/12/16.
  */
 public interface PayOrderService {
-    PageInfo<PayRecords> getOrder(int pageSize, int pageNum);
+    PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber);
 
     int addOrder(PayRecords payRecords);
 

@@ -8,6 +8,7 @@ import com.sunyo.energy.location.model.PayRecords;
 import com.sunyo.energy.location.service.PayOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -21,10 +22,18 @@ public class PayOrderImpl implements PayOrderService {
 
 
     @Override
-    public PageInfo<PayRecords> getOrder(int pageSize, int pageNum) {
+    public PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber) {
 
         Page<PayRecords> page =  PageHelper.startPage(pageNum,pageSize);
-        List<PayRecords> list = recordsMapper.findAll();
+
+        if (StringUtils.isEmpty(orderNumber)){
+
+        }else if (!orderNumber.contains("-")){
+            StringBuffer stringBuffer = new StringBuffer(orderNumber);
+            orderNumber = stringBuffer.insert(3, "-").toString();
+        }
+
+        List<PayRecords> list = recordsMapper.findAll(orderNumber);
 
         PageInfo<PayRecords> result = new PageInfo<>(list);
         return result;

@@ -145,14 +145,41 @@ public class HttpsUtils {
     // 测试是否有效
 //    public static void main(String[] args) {
 //        // 接口地址
-//        String requestUrl = "http://123.56.159.203:8023/mtfmset/allWMadd";
+//        String requestUrl = "http://localhost:8080/manifest/f5f5669bbdecefd3dacfaba194647c35";
 //        try {
 //
-//            String url = "http://123.56.159.203:8023/nowwmrd/getSelectNowwmrdbyProjectID";
 //            Map<String, Object> datas = new HashMap<>();
-//            datas.put("ProjectID", "33-99-00-00-00-00-01");
-//            List list = new ArrayList<>();
+//            datas.put("de_size", "dcdf38d9a5d6411985e49155481882f5");
+//            datas.put("waybillnomaster", "66611111111");
+//            datas.put("de_type", "001");
+//            datas.put("delivery_station", "001");
+//            datas.put("flightno", "CA9999");
+//            datas.put("flightdate", "2019-9-21 00:00:00");
+//            datas.put("originatingstation", "CGO");
+//            datas.put("destinationstation", "CGO");
+//            datas.put("totalpiece", "19");
+//            datas.put("totalweight", "19");
+//            datas.put("paymode", "PP");
+//            datas.put("customsstatus", "001");
+//            datas.put("customscode", "4604");
+//            datas.put("productname", "SHOUJI");
+//            datas.put("co_company", "测试");
+//            datas.put("co_address", "测试");
+//            datas.put("co_telephone", "00000000");
+//            datas.put("co_country", "CN");
+//            datas.put("sh_company", "测试");
+//            datas.put("sh_address", "测试");
+//            datas.put("sh_country", "CN");
+//            datas.put("sh_telephone", "0000000");
+//            datas.put("sh_city", "测试");
+//            datas.put("USER_ID", "1");
+//            datas.put("reach_station", "CGO");
+//            datas.put("de_volume", "000100003_MMM");
+//            datas.put("de_trstation", "APL，111");
 //
+//            String param ="waybillnomaster=666-11111111&de_volume=66611111111_MMM&de_type=001&delivery_station=001&flightno=CV9765&flightdate=2019-12-20&originatingstation=CGO&destinationstation=ORD&totalpiece=1&totalweight=136.00&paymode=PP&customsstatus=001&customscode=4604&productname=CONSOL&co_company=DSV+AIR+%26+SEA+CO.%2c+LTD&co_address=8%269F%2c+RAFFLES+CITY+CHANGNING+OFFI.+TOWER+3%2c+NO.+1193+CHANGNING+RDSHANG&co_zipcode=200051&shpcusid=&shpaeo=&co_telephone=%2b86+21+33259800&co_country=CN&sh_company=ORD-DSV+AIR++SEA+INC&sh_address=1300+N+ARLINGTON+HEIGHTS+ROAD+SUITE+US&sh_zipcode=60143&cnecusid=&cneaeo=&sh_country=US&sh_telephone=8479568855&sh_fax=&sh_city=CHICAGO&USER_ID=1640&reach_station=ORD&de_trstation=BDX%2c111&de_packing=BDX%2c222&de_remarks=BDX%2c333&de_size=dcdf38d9a5d6411985e49155481882f5";
+//            String ss = HttpsUtils.sendPostHttpRequest(requestUrl, param);
+//            JSONArray jsonArray = JSON.parseArray(ss);
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //        }

@@ -103,14 +103,17 @@ eureka:
     prefer-ip-address: true
     instance-id:  ${spring.cloud.client.ip-address}:${server.port}
     hostname: ${spring.cloud.client.ip-address}
+    lease-renewal-interval-in-seconds: 15
+    lease-expiration-duration-in-seconds: 45
+
   client:
     #eureka注册中心服务器地址
     service-url:
 #      defaultZone: http://127.0.0.1:12345/eureka/
       defaultZone: http://192.168.1.53:12345/eureka/
+#      defaultZone: http://192.168.43.78:12345/eureka/
     registry-fetch-interval-seconds:  30
-    lease-renewal-interval-in-seconds: 15
-    lease-expiration-duration-in-seconds: 45
+
 
 
 
@@ -133,7 +136,7 @@ logging:
   file:
     path: ./logs/
     name: system.log
-  config: config/logback-dev.xml
+  config: classpath:logback-dev.xml
   #转移到logback配置文件中
   #level:
     #org.apache.tomcat: info

@@ -34,12 +34,19 @@
     select
     <include refid="Base_Column_List" />
     from pay_records
+    where reamke1 = '0'
+    <if test="orderNumber != '' and orderNumber != null">
+      and orderNumber = #{orderNumber,jdbcType=VARCHAR}
+    </if>
+    order by payTime desc
   </select>
 
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from pay_records
+  <update id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    UPDATE  pay_records
+    SET reamke1 = '1'
     where id = #{id,jdbcType=INTEGER}
-  </delete>
+  </update>
+
   <insert id="insert" parameterType="com.sunyo.energy.location.model.PayRecords" >
     insert into pay_records (id, payFees, payUserId, 
       payTime, payLocationId, payStatus,