修改收货地址 完善

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/platformFskfsfs/FskfsfsAddressExcelVo.java

+package com.liquidnet.service.kylin.dto.param.platformFskfsfs;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * @author jiangxiulong
+ */
+@ApiModel(value = "FskfsfsAddressExcelVo")
+@Data
+public class FskfsfsAddressExcelVo {
+
+    @ApiModelProperty(value = "订单编号")
+    private String orderCode;
+    @ApiModelProperty(value = "收货人姓名")
+    private String userName;
+    @ApiModelProperty(value = "收货人手机号")
+    private String phone;
+    @ApiModelProperty(value = "收货人地址")
+    private String address;
+
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/A_fskfsfs/JxlDataKylinOrderController.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.param.AddressVo;
+import com.liquidnet.service.kylin.dto.param.platformFskfsfs.FskfsfsAddressExcelVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
@@ -120,13 +120,13 @@ public class JxlDataKylinOrderController {
             @RequestParam MultipartFile file
     ) {
         try {
-            EasyExcel.read("/Users/jiangxiulong/Desktop" + File.separator + file.getOriginalFilename(), AddressVo.class, new PageReadListener<AddressVo>(dataList -> {
-                for (AddressVo demoData : dataList) {
-                    String userName = demoData.getProvince();
-                    String address = demoData.getCity();
-                    String phone = demoData.getCounty();
-                    String orderCode = demoData.getName();
-                    log.info("orderCode:{}，phone:{}，address:{}，userName:{}，", orderCode, phone, address, userName);
+            EasyExcel.read("/Users/jiangxiulong/Desktop" + File.separator + file.getOriginalFilename(), FskfsfsAddressExcelVo.class, new PageReadListener<FskfsfsAddressExcelVo>(dataList -> {
+                for (FskfsfsAddressExcelVo demoData : dataList) {
+                    String orderCode = demoData.getOrderCode();
+                    String userName = demoData.getUserName();
+                    String phone = demoData.getPhone();
+                    String address = demoData.getAddress();
+                    log.info("orderCode:{}，userName:{}，phone:{}，address:{}，", orderCode, userName, phone, address);
 
                     // 获取订单 id
                     KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(
@@ -137,12 +137,18 @@ public class JxlDataKylinOrderController {
                     if (null == userName || userName.isEmpty()) {
                         userName = kylinOrderTickets.getExpressContacts();
                     }
+                    if (null == phone || phone.isEmpty()) {
+                        phone = kylinOrderTickets.getExpressPhone();
+                    }
+                    if (null == address || address.isEmpty()) {
+                        address = kylinOrderTickets.getExpressAddress();
+                    }
 
                     // mysql
                     KylinOrderTickets aNew = KylinOrderTickets.getNew();
                     aNew.setExpressContacts(userName);
-                    aNew.setExpressAddress(address);
                     aNew.setExpressPhone(phone);
+                    aNew.setExpressAddress(address);
                     kylinOrderTicketsMapper.update(aNew,
                             Wrappers.lambdaUpdate(KylinOrderTickets.class)
                                     .eq(KylinOrderTickets::getOrderTicketsId, orderTicketsId)