12/2

src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java

@@ -35,6 +35,7 @@ public class AppletVo {
     private List<GoodsVo> goodsVos;
     private List<StoreSelect> select;
     private String storeSid;//上次提货地点
+    private String addressName;
 
 
     public String getStart() {

src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDetailsVo.java

@@ -17,12 +17,12 @@ public class LpkGoodsDetailsVo implements Vo {
 
     private String sid;
     private String createTime;
-    private String remarks;
+    private String remarks; //规格
-    private String code;
+    private String code;//商品编码
-    private String barcode;
+    private String barcode;//商品条码
-    private String name;
+    private String name;//商品名
-    private String unitName;
+    private String unitName;//单位
-    private String typeCode;
+    private String typeCode;//类别编码
-    private String price;
+    private String price;//商品价格
-    private String picUrl;
+    private String picUrl;//图片
 }

src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderDto.java

@@ -22,4 +22,5 @@ public class LpkReserveOrderDto implements Dto {
     private String  userPhone;//用户联系方式
     private List<GoodsVo> goodsVos;
     private String orderSid;
+    private String addressName;
 }

src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreVo.java

@@ -26,6 +26,6 @@ public class LpkStoreVo implements Vo {
     private String phone;//电话
     private String businessHours;//营业时间，提货时间（早X点到晚X点）
     private String linker;//联系人
-    private  String sort;//排序
+    private String sort;//排序
-    private  String isEnable;//排序
+    private String isEnable;//排序
 }

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

@@ -20,6 +20,7 @@ import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo;
 import com.yxt.yyth.api.lpkgiftcard.*;
 import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo;
 import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods;
+import com.yxt.yyth.api.lpkstore.LpkStoreDetailsVo;
 import com.yxt.yyth.api.lpkstore.StoreSelect;
 import com.yxt.yyth.biz.lpkcardbuildrecord.LpkCardBuildRecordService;
 import com.yxt.yyth.biz.lpkcardgrantrecord.LpkCardGrantRecordService;
@@ -201,10 +202,10 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         vo.setSelect(l);
         LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
         if (null != vo1) {
-//        vo.setSelect(l);
+            LpkStoreDetailsVo vo2= lpkStoreService.storeInit(vo1.getStoreSid()).getData();
-//        LpkReserveOrderVo vo1 =lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
+            if(null!=vo2){
-//        if(null!=vo1){
+                vo.setAddressName(vo2.getName());
-            vo.setStoreSid(vo1.getStore());
+            }
         }
         return rb.success().setData(vo);
     }

src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml

@@ -41,7 +41,8 @@
                unitName,
                typeCode,
                price,
-               picUrl
+               picUrl,
+               remarks
         from lpk_goods
         where sid=#{sid}
     </select>

src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreRest.java

@@ -59,7 +59,7 @@ public class LpkStoreRest {
     }
     @ApiOperation("获取全部取货点名称")
     @PostMapping ("/getAllStoreByQuery")
-    public ResultBean getAllStoreByQuery(LpkStoreQuery query){
+    public ResultBean getAllStoreByQuery(@RequestBody LpkStoreQuery query){
         return lpkStoreService.getAllStoreByQuery(query);
     }
     @ApiOperation("修改是否可用")