12.6修改功能代码

44e10559 · xuwenhao · 13a5cccd · 44e10559 · 44e10559 · 44e10559
Commit 44e10559 authored Dec 06, 2023 by xuwenhao
20 changed files
--- a/qianhe-admin/src/main/java/com/qianhe/system/controller/WaterGoodsCartController.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/controller/WaterGoodsCartController.java
@@ -6,11 +6,14 @@ import com.qianhe.common.core.domain.AjaxResult;
 import com.qianhe.common.core.page.TableDataInfo;
 import com.qianhe.common.enums.BusinessType;
 import com.qianhe.system.domain.WaterGoodsCart;
+import com.qianhe.system.domain.WaterGoodsImg;
 import com.qianhe.system.service.IWaterGoodsCartService;
+import com.qianhe.system.service.IWaterGoodsImgService;
 import com.qianhe.system.vo.WaterGoodsVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
 import java.util.List;
 @RestController
@@ -19,6 +22,8 @@ public class WaterGoodsCartController extends BaseController {
    @Autowired
    private IWaterGoodsCartService waterGoodsCartService;
+    @Autowired
+    private IWaterGoodsImgService waterGoodsImgService;
    /**
     * 查询购物车列表
@@ -27,8 +32,29 @@ public class WaterGoodsCartController extends BaseController {
     */
    @GetMapping("/list")
    public TableDataInfo list(WaterGoodsCart waterGoodsCart){
-        startPage();
+        //查询全部商品图片
+        List<WaterGoodsImg> waterGoodsImgList = waterGoodsImgService.selectWaterGoodsImgList(new WaterGoodsImg());
        List<WaterGoodsCart> list = waterGoodsCartService.selectWaterGoodsCartList(waterGoodsCart);
+        for (WaterGoodsCart goodsCart : list) {
+            //封面图集合
+            List<WaterGoodsImg> coverImgs = new ArrayList<>();
+            //详情图集合
+            List<WaterGoodsImg> detailsImgs = new ArrayList<>();
+            for (WaterGoodsImg waterGoodsImg : waterGoodsImgList) {
+                //封面图
+                if (goodsCart.getGoodsId().equals(waterGoodsImg.getGoodsId()) && waterGoodsImg.getImgType() == 1){
+                    coverImgs.add(waterGoodsImg);
+                }else if (goodsCart.getGoodsId().equals(waterGoodsImg.getGoodsId()) && waterGoodsImg.getImgType() == 2){
+                    detailsImgs.add(waterGoodsImg);
+                }
+            }
+            if (coverImgs.size() > 0){
+                goodsCart.setCoverImgs(coverImgs);
+            }
+            if (detailsImgs.size() > 0){
+                goodsCart.setDetailsImgs(detailsImgs);
+            }
+        }
        return getDataTable(list);
    }

--- a/qianhe-admin/src/main/java/com/qianhe/system/controller/WaterOrderController.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/controller/WaterOrderController.java
@@ -6,13 +6,16 @@ import com.qianhe.common.core.domain.AjaxResult;
 import com.qianhe.common.core.page.TableDataInfo;
 import com.qianhe.common.enums.BusinessType;
 import com.qianhe.common.utils.poi.ExcelUtil;
+import com.qianhe.system.domain.WaterGoodsImg;
 import com.qianhe.system.domain.WaterOrder;
 import com.qianhe.system.domain.WaterOrderGoods;
+import com.qianhe.system.service.IWaterGoodsImgService;
 import com.qianhe.system.service.IWaterOrderGoodsService;
 import com.qianhe.system.service.IWaterOrderService;
 import com.qianhe.system.vo.WaterOrderVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -34,6 +37,10 @@ public class WaterOrderController extends BaseController
    private IWaterOrderService waterOrderService;
    @Autowired
    private IWaterOrderGoodsService waterOrderGoodsService;
+    @Autowired
+    private IWaterGoodsImgService waterGoodsImgService;
+    @Value("${ruoyi.serverAddress}")
+    private String serverAddress;
    /**
     * 查询订单列表(管理端)
@@ -76,6 +83,8 @@ public class WaterOrderController extends BaseController
        List<WaterOrder> list = waterOrderService.selectWaterOrderList(waterOrderVo);
        //查询所有订单商品
        List<WaterOrderGoods> waterOrderGoods = waterOrderGoodsService.selectWaterOrderGoodsList(new WaterOrderGoods());
+        //查询所有商品图片
+        List<WaterGoodsImg> waterGoodsImgs = waterGoodsImgService.selectWaterGoodsImgList(new WaterGoodsImg());
        if (list.size() > 0){
            for (WaterOrder order : list) {
                //转vo
@@ -85,6 +94,23 @@ public class WaterOrderController extends BaseController
                for (WaterOrderGoods waterOrderGood : waterOrderGoods) {
                    if (order.getId().equals(waterOrderGood.getOrderId())){
 //                        waterOrderGoodsList.add(waterOrderGood);
+                        //封面图集合
+                        List<WaterGoodsImg> coverImgs = new ArrayList<>();
+                        //详情图集合
+                        List<WaterGoodsImg> detailsImgs = new ArrayList<>();
+                        for (WaterGoodsImg waterGoodsImg : waterGoodsImgs) {
+                            if (waterOrderGood.getGoodsId().equals(waterGoodsImg.getGoodsId()) && waterGoodsImg.getImgType() == 1){
+                                coverImgs.add(waterGoodsImg);
+                            }else if (waterOrderGood.getGoodsId().equals(waterGoodsImg.getGoodsId()) && waterGoodsImg.getImgType() == 2){
+                                detailsImgs.add(waterGoodsImg);
+                            }
+                        }
+                        if (coverImgs.size() > 0){
+                            waterOrderGood.setCoverImgs(coverImgs);
+                        }
+                        if (detailsImgs.size() > 0){
+                            waterOrderGood.setDetailsImgs(detailsImgs);
+                        }
                        waterOrderVo1.setWaterOrderGoods(waterOrderGood);
                        waterOrderVoList.add(waterOrderVo1);
                    }
@@ -179,7 +205,7 @@ public class WaterOrderController extends BaseController
    }
    /**
-     * 统计站点订单数量
+     * 统计站点订单数量（送水端）
     */
    @GetMapping("/getOrderNumByStation")
    public AjaxResult getOrderNumByStation(Long stationId){
@@ -187,7 +213,7 @@ public class WaterOrderController extends BaseController
    }
    /**
-     * 根据站点查询订单
+     * 根据站点查询订单(送水端)
     */
    @GetMapping("/getWaterOrderListByStationId")
    public TableDataInfo getWaterOrderListByStationId(WaterOrderVo waterOrderVo){
@@ -196,6 +222,8 @@ public class WaterOrderController extends BaseController
        List<WaterOrder> list = waterOrderService.getWaterOrderListByStationId(waterOrderVo);
        //查询所有订单商品
        List<WaterOrderGoods> waterOrderGoods = waterOrderGoodsService.selectWaterOrderGoodsList(new WaterOrderGoods());
+        //查询所有商品图片
+        List<WaterGoodsImg> waterGoodsImgs = waterGoodsImgService.selectWaterGoodsImgList(new WaterGoodsImg());
        if (list.size() > 0){
            for (WaterOrder order : list) {
                //转vo
@@ -204,14 +232,32 @@ public class WaterOrderController extends BaseController
                List<WaterOrderGoods> waterOrderGoodsList = new ArrayList<>();
                for (WaterOrderGoods waterOrderGood : waterOrderGoods) {
                    if (order.getId().equals(waterOrderGood.getOrderId())){
-//                        waterOrderGoodsList.add(waterOrderGood);
+                        //封面图集合
-                        waterOrderVo1.setWaterOrderGoods(waterOrderGood);
+                        List<WaterGoodsImg> coverImgs = new ArrayList<>();
-                        waterOrderVoList.add(waterOrderVo1);
+                        //详情图集合
+                        List<WaterGoodsImg> detailsImgs = new ArrayList<>();
+                        for (WaterGoodsImg waterGoodsImg : waterGoodsImgs) {
+                            if (waterOrderGood.getGoodsId().equals(waterGoodsImg.getGoodsId()) && waterGoodsImg.getImgType() == 1){
+                                coverImgs.add(waterGoodsImg);
+                            }else if (waterOrderGood.getGoodsId().equals(waterGoodsImg.getGoodsId()) && waterGoodsImg.getImgType() == 2){
+                                detailsImgs.add(waterGoodsImg);
+                            }
+                        }
+                        if (coverImgs.size() > 0){
+                            waterOrderGood.setCoverImgs(coverImgs);
+                        }
+                        if (detailsImgs.size() > 0){
+                            waterOrderGood.setDetailsImgs(detailsImgs);
+                        }
+                        waterOrderGoodsList.add(waterOrderGood);
+//                        waterOrderVo1.setWaterOrderGoods(waterOrderGood);
+//                        waterOrderVoList.add(waterOrderVo1);
                    }
                }
-//                if (waterOrderGoodsList.size() > 0){
+                if (waterOrderGoodsList.size() > 0){
-//                    waterOrderVo1.setWaterOrderGoodsList(waterOrderGoodsList);
+                    waterOrderVo1.setWaterOrderGoodsList(waterOrderGoodsList);
-//                }
+                }
                waterOrderVoList.add(waterOrderVo1);
            }
        }

--- a/qianhe-admin/src/main/java/com/qianhe/system/controller/api/SsWxLogin.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/controller/api/SsWxLogin.java
@@ -96,6 +96,7 @@ public class SsWxLogin {
     */
    @PostMapping("/updateUser")
    public AjaxResult updateUser(@RequestBody WaterUser waterUser){
+        waterUser.setUserType("2");
        return success(waterUserService.updateUserByOpenId(waterUser));
    }
@@ -109,7 +110,7 @@ public class SsWxLogin {
        String openId = userInfoUtil.getOpenId();
        Map<String,Object> map = new HashMap<>();
        //根据openid查询用户信息
-        WaterUser waterUser = waterUserService.selectUserByOpenId(openId);
+        WaterUser waterUser = waterUserService.selectUserByOpenId(openId,"2");
        map.put("userId",waterUser.getId());
        map.put("nickName",waterUser.getNickName());
        map.put("phoneNum",waterUser.getPhoneNum());

--- a/qianhe-admin/src/main/java/com/qianhe/system/controller/api/WxLogin.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/controller/api/WxLogin.java
@@ -90,6 +90,7 @@ public class WxLogin {
     */
    @PostMapping("/updateUser")
    public AjaxResult updateUser(@RequestBody WaterUser waterUser){
+        waterUser.setUserType("1");
        return success(waterUserService.updateUserByOpenId(waterUser));
    }
@@ -103,7 +104,7 @@ public class WxLogin {
        String openId = userInfoUtil.getOpenId();
        Map<String,Object> map = new HashMap<>();
        //根据openid查询用户信息
-        WaterUser waterUser = waterUserService.selectUserByOpenId(openId);
+        WaterUser waterUser = waterUserService.selectUserByOpenId(openId,"1");
        map.put("userId",waterUser.getId());
        map.put("nickName",waterUser.getNickName());
        map.put("phoneNum",waterUser.getPhoneNum());

--- a/qianhe-admin/src/main/java/com/qianhe/system/domain/WaterGoodsCart.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/domain/WaterGoodsCart.java
@@ -5,6 +5,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 @Data
 public class WaterGoodsCart {
@@ -57,4 +58,10 @@ public class WaterGoodsCart {
    /** 创建时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;
+    /** 封面图集合 */
+    private List<WaterGoodsImg> coverImgs;
+    /** 详情图集合 */
+    private List<WaterGoodsImg> detailsImgs;
 }
--- a/qianhe-admin/src/main/java/com/qianhe/system/domain/WaterOrder.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/domain/WaterOrder.java
@@ -181,4 +181,7 @@ public class WaterOrder
    /** 订单类型（1普通订单2退款订单） */
    @Excel(name = "订单类型", readConverterExp = "1=普通订单2退款订单")
    private Integer orderType;
+    /** 退款原因 */
+    private String returnOrderResult;
 }
--- a/qianhe-admin/src/main/java/com/qianhe/system/domain/WaterOrderGoods.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/domain/WaterOrderGoods.java
@@ -9,6 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 /**
 * 订单商品对象 water_order_goods
@@ -65,4 +66,10 @@ public class WaterOrderGoods
    /** 创建人 */
    private String createUser;
+    /** 封面图集合 */
+    private List<WaterGoodsImg> coverImgs;
+    /** 详情图集合 */
+    private List<WaterGoodsImg> detailsImgs;
 }
--- a/qianhe-admin/src/main/java/com/qianhe/system/mapper/WaterUserMapper.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/mapper/WaterUserMapper.java
@@ -3,6 +3,7 @@ package com.qianhe.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qianhe.common.core.domain.model.WxLoginBody;
 import com.qianhe.system.domain.WaterUser;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -67,7 +68,7 @@ public interface WaterUserMapper extends BaseMapper<WaterUser>
     * @param openId
     * @return
     */
-    WaterUser selectUserByOpenId(String openId);
+    WaterUser selectUserByOpenId(@Param("openId") String openId,@Param("userType") String userType);
    /**
     * 根据openid修改用户信息

--- a/qianhe-admin/src/main/java/com/qianhe/system/service/IWaterUserService.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/service/IWaterUserService.java
@@ -68,7 +68,7 @@ public interface IWaterUserService extends IService<WaterUser>
     * @param openId
     * @return
     */
-    WaterUser selectUserByOpenId(String openId);
+    WaterUser selectUserByOpenId(String openId,String userType);
    /**
     * 根据openid修改用户信息

--- a/qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterGoodsCartServiceImpl.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterGoodsCartServiceImpl.java
@@ -4,8 +4,10 @@ import com.qianhe.common.utils.DateUtils;
 import com.qianhe.common.utils.StringUtils;
 import com.qianhe.system.domain.WaterGoods;
 import com.qianhe.system.domain.WaterGoodsCart;
+import com.qianhe.system.domain.WaterGoodsImg;
 import com.qianhe.system.domain.WaterGoodsSpeVal;
 import com.qianhe.system.mapper.WaterGoodsCartMapper;
+import com.qianhe.system.mapper.WaterGoodsImgMapper;
 import com.qianhe.system.mapper.WaterGoodsMapper;
 import com.qianhe.system.mapper.WaterGoodsSpeMapper;
 import com.qianhe.system.service.IWaterGoodsCartService;
@@ -25,6 +27,8 @@ public class WaterGoodsCartServiceImpl implements IWaterGoodsCartService {
    private WaterGoodsMapper waterGoodsMapper;
    @Autowired
    private WaterGoodsSpeMapper waterGoodsSpeMapper;
+    @Autowired
+    private WaterGoodsImgMapper waterGoodsImgMapper;
    /**
     * 查询购物车列表
@@ -54,6 +58,17 @@ public class WaterGoodsCartServiceImpl implements IWaterGoodsCartService {
    @Override
    @Transactional
    public int insertWaterGoodsCart(WaterGoodsCart waterGoodsCart) {
+        //根据商品信息查询该规格商品是否已经存在购物车中
+        List<WaterGoodsCart> list = selectWaterGoodsCartList(waterGoodsCart);
+        if (list.size() > 0){
+            //如果该用户购物车中存在该规格商品，则购物车商品数量+1
+            WaterGoodsCart waterGoodsCart1 = list.get(0);
+            WaterGoodsCart waterGoodsCart2 = new WaterGoodsCart();
+            waterGoodsCart2.setId(waterGoodsCart1.getId());
+            waterGoodsCart2.setGoodsNum(waterGoodsCart1.getGoodsNum() + 1);
+            waterGoodsCart2.setGoodsTotal(BigDecimal.valueOf(waterGoodsCart1.getGoodsPrice().doubleValue() * waterGoodsCart2.getGoodsNum()));
+            return waterGoodsCartMapper.updateWaterGoodsCart(waterGoodsCart2);
+        }
        //根据商品id查询商品信息
        WaterGoods waterGoods = waterGoodsMapper.selectWaterGoodsById(waterGoodsCart.getGoodsId());
        //根据规格值id查询规格值
@@ -62,8 +77,9 @@ public class WaterGoodsCartServiceImpl implements IWaterGoodsCartService {
        waterGoodsCart.setGoodsTypeId(waterGoods.getGoodsTypeId());
        waterGoodsCart.setGoodsSpeVal(waterGoodsSpeVal.getSpe() + ":" + waterGoodsSpeVal.getSpeVal());
        waterGoodsCart.setGoodsPrice(waterGoodsSpeVal.getPrice());
-        waterGoodsCart.setGoodsTotal(BigDecimal.valueOf(waterGoodsSpeVal.getPrice().doubleValue() * waterGoodsCart.getGoodsNum()));
+        waterGoodsCart.setGoodsTotal(waterGoodsSpeVal.getPrice());
        waterGoodsCart.setCreateUser(waterGoodsCart.getUserId().toString());
+        waterGoodsCart.setGoodsNum(1);
        waterGoodsCart.setCreateTime(DateUtils.getNowDate());
        return waterGoodsCartMapper.insertWaterGoodsCart(waterGoodsCart);
    }

--- a/qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterOrderServiceImpl.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterOrderServiceImpl.java
@@ -4,8 +4,10 @@ import com.qianhe.common.exception.ServiceException;
 import com.qianhe.common.utils.DateUtils;
 import com.qianhe.common.utils.StringUtils;
 import com.qianhe.system.domain.WaterGoods;
+import com.qianhe.system.domain.WaterGoodsImg;
 import com.qianhe.system.domain.WaterOrder;
 import com.qianhe.system.domain.WaterOrderGoods;
+import com.qianhe.system.mapper.WaterGoodsImgMapper;
 import com.qianhe.system.mapper.WaterGoodsMapper;
 import com.qianhe.system.mapper.WaterOrderGoodsMapper;
 import com.qianhe.system.mapper.WaterOrderMapper;
@@ -18,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -37,6 +40,8 @@ public class WaterOrderServiceImpl implements IWaterOrderService
    private WaterOrderGoodsMapper waterOrderGoodsMapper;
    @Autowired
    private WaterGoodsMapper waterGoodsMapper;
+    @Autowired
+    private WaterGoodsImgMapper waterGoodsImgMapper;
    /**
     * 查询订单
@@ -55,9 +60,33 @@ public class WaterOrderServiceImpl implements IWaterOrderService
        WaterOrderGoods waterOrderGoods = new WaterOrderGoods();
        waterOrderGoods.setOrderId(id);
        List<WaterOrderGoods> waterOrderGoodsList = waterOrderGoodsMapper.selectWaterOrderGoodsList(waterOrderGoods);
+        //查询商品图片信息
+        List<WaterGoodsImg> waterGoodsImgs = waterGoodsImgMapper.selectWaterGoodsImgList(new WaterGoodsImg());
+        //订单商品集合
+        List<WaterOrderGoods> waterOrderGoodsList1 = new ArrayList<>();
        if (waterOrderGoodsList.size() > 0){
-            waterOrderVo.setWaterOrderGoodsList(waterOrderGoodsList);
+            for (WaterOrderGoods waterOrderGood : waterOrderGoodsList) {
+                //封面图集合
+                List<WaterGoodsImg> coverImgs = new ArrayList<>();
+                //详情图集合
+                List<WaterGoodsImg> detailsImgs = new ArrayList<>();
+                for (WaterGoodsImg waterGoodsImg : waterGoodsImgs) {
+                    if (waterOrderGood.getGoodsId().equals(waterGoodsImg.getGoodsId()) && waterGoodsImg.getImgType() == 1){
+                        coverImgs.add(waterGoodsImg);
+                    }else if (waterOrderGood.getGoodsId().equals(waterGoodsImg.getGoodsId()) && waterGoodsImg.getImgType() == 2){
+                        detailsImgs.add(waterGoodsImg);
+                    }
+                }
+                if (coverImgs.size() > 0){
+                    waterOrderGood.setCoverImgs(coverImgs);
+                }
+                if (detailsImgs.size() > 0){
+                    waterOrderGood.setDetailsImgs(detailsImgs);
+                }
+                waterOrderGoodsList1.add(waterOrderGood);
+            }
        }
+        waterOrderVo.setWaterOrderGoodsList(waterOrderGoodsList1);
        return waterOrderVo;
    }

--- a/qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterUserAddressServiceImpl.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterUserAddressServiceImpl.java
 package com.qianhe.system.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qianhe.common.utils.StringUtils;
 import com.qianhe.system.domain.WaterUserAddress;
 import com.qianhe.system.mapper.WaterUserAddressMapper;
 import com.qianhe.system.service.IWaterUserAddressService;
@@ -54,6 +55,11 @@ public class WaterUserAddressServiceImpl extends ServiceImpl<WaterUserAddressMap
    @Override
    public int insertWaterUserAddress(WaterUserAddress waterUserAddress)
    {
+        //判断用户是否设置默认地址
+        if (StringUtils.isNotEmpty(waterUserAddress.getIsDefault()) && waterUserAddress.getIsDefault().equals("1")) {
+            //将该用户所有默认地址设备不默认
+            waterUserAddressMapper.updateDefaultAddress(waterUserAddress.getWaterUserId());
+        }
        return waterUserAddressMapper.insertWaterUserAddress(waterUserAddress);
    }
@@ -66,6 +72,11 @@ public class WaterUserAddressServiceImpl extends ServiceImpl<WaterUserAddressMap
    @Override
    public int updateWaterUserAddress(WaterUserAddress waterUserAddress)
    {
+        //判断用户是否设置默认地址
+        if (StringUtils.isNotEmpty(waterUserAddress.getIsDefault()) && waterUserAddress.getIsDefault().equals("1")) {
+            //将该用户所有默认地址设备不默认
+            waterUserAddressMapper.updateDefaultAddress(waterUserAddress.getWaterUserId());
+        }
        return waterUserAddressMapper.updateWaterUserAddress(waterUserAddress);
    }

--- a/qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterUserServiceImpl.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterUserServiceImpl.java
@@ -120,8 +120,8 @@ public class WaterUserServiceImpl extends ServiceImpl<WaterUserMapper,WaterUser>
     * @return
     */
    @Override
-    public WaterUser selectUserByOpenId(String openId) {
+    public WaterUser selectUserByOpenId(String openId,String userType) {
-        return waterUserMapper.selectUserByOpenId(openId);
+        return waterUserMapper.selectUserByOpenId(openId,userType);
    }
    /**

--- a/qianhe-admin/src/main/java/com/qianhe/system/service/impl/api/WxLoginServiceImpl.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/service/impl/api/WxLoginServiceImpl.java
@@ -19,7 +19,7 @@ public class WxLoginServiceImpl implements IWxLoginService {
    @Override
    public MpLoginUser login(WxLoginBody wxLoginBody) {
        //根据用户openid查询用户是否存在
-        WaterUser user = waterUserMapper.selectUserByOpenId(wxLoginBody.getOpenId());
+        WaterUser user = waterUserMapper.selectUserByOpenId(wxLoginBody.getOpenId(),"1");
        if (StringUtils.isNotNull(user)){
            //存在
            MpLoginUser loginUser = new MpLoginUser();
@@ -48,7 +48,7 @@ public class WxLoginServiceImpl implements IWxLoginService {
    @Override
    public MpLoginUser ssLogin(WxLoginBody wxLoginBody) {
        //根据用户openid查询用户是否存在
-        WaterUser user = waterUserMapper.selectUserByOpenId(wxLoginBody.getOpenId());
+        WaterUser user = waterUserMapper.selectUserByOpenId(wxLoginBody.getOpenId(),"2");
        if (StringUtils.isNotNull(user)){
            //存在
            MpLoginUser loginUser = new MpLoginUser();

--- a/qianhe-admin/src/main/java/com/qianhe/system/vo/WaterOrderVo.java
+++ b/qianhe-admin/src/main/java/com/qianhe/system/vo/WaterOrderVo.java
@@ -146,6 +146,9 @@ public class WaterOrderVo {
    /** 订单类型（1普通订单2退款订单） */
    private Integer orderType;
+    /** 退款原因 */
+    private String returnOrderResult;
    /** 开始时间 */
    private String startTime;
@@ -158,4 +161,7 @@ public class WaterOrderVo {
    /** 商品 */
    @Excel(name = "商品")
    private List<WaterOrderGoods> waterOrderGoodsList;
+    /** 触底请求参数 */
+    private Integer pageNum;
 }
--- a/qianhe-admin/src/main/resources/application.yml
+++ b/qianhe-admin/src/main/resources/application.yml
@@ -14,6 +14,7 @@ ruoyi:
  addressEnabled: false
  # 验证码类型 math 数组计算 char 字符验证
  captchaType: math
+  serverAddress: http://192.168.1.112:8089
 # 开发环境配置
 server:
@@ -74,7 +75,7 @@ spring:
    # 端口，默认为6379
    port: 7789
    # 数据库索引
-    database: 1
+    database: 2
    # 密码
    password: qianheRedis2021
    # 连接超时时间
@@ -138,6 +139,6 @@ wx:
 # 送水端小程序
 sswx:
-  appId: wxcabea5c944c4327c
+  appId: wxc89600b5b0aee68d
-  appSecret: bd486fd54bd1ea5e9b198911d765ce6a
+  appSecret: 27ebe3778435c719cc1b97f260b7e026
  access-token-uri: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=${sswx.appId}&secret=${sswx.appSecret}
--- a/qianhe-admin/src/main/resources/mapper/WaterOrderMapper.xml
+++ b/qianhe-admin/src/main/resources/mapper/WaterOrderMapper.xml
@@ -46,10 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="remark"    column="remark"    />
        <result property="goodsVal"    column="goods_val"    />
        <result property="orderType"    column="order_type"    />
+        <result property="returnOrderResult"    column="return_order_result"    />
    </resultMap>
    <sql id="selectWaterOrderVo">
-        select id, order_num, user_id, user_name, user_phone, user_province, user_city, user_area, user_address, station_id, station_name, station_phone, station_province, station_city, station_area, station_address, order_state, complete_state, confirm_state, pay_state, pay_type, pay_num, cancel_result, user_address_id, name, province, city, area, address, mobile, deliever_time, deliever_name, deliever_mobile, create_time, create_user, deliever_over, take_time, finish_time, remark, goods_val, order_type from water_order
+        select id, order_num, user_id, user_name, user_phone, user_province, user_city, user_area, user_address, station_id, station_name, station_phone, station_province, station_city, station_area, station_address, order_state, complete_state, confirm_state, pay_state, pay_type, pay_num, cancel_result, user_address_id, name, province, city, area, address, mobile, deliever_time, deliever_name, deliever_mobile, create_time, create_user, deliever_over, take_time, finish_time, remark, goods_val, order_type, return_order_result from water_order
    </sql>
    <select id="selectWaterOrderList" parameterType="com.qianhe.system.vo.WaterOrderVo" resultMap="WaterOrderResult">
@@ -107,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="stationId != null "> and station_id = #{stationId}</if>
            <if test="orderState != null "> and order_state = #{orderState}</if>
        </where>
-        order by create_time DESC
+        order by create_time DESC limit #{pageNum}
    </select>
    <select id="selectWaterOrderById" parameterType="Long" resultMap="WaterOrderResult">
@@ -148,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="remark != null">remark,</if>
            <if test="goodsVal != null">goods_val,</if>
            <if test="orderType != null">order_type,</if>
+            <if test="returnOrderResult != null">return_order_result,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="orderNum != null">#{orderNum},</if>
@@ -193,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="remark != null">#{remark},</if>
            <if test="goodsVal != null">#{goodsVal},</if>
            <if test="orderType != null">#{orderType},</if>
+            <if test="returnOrderResult != null">#{returnOrderResult},</if>
         </trim>
    </insert>
@@ -244,6 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="remark != null">remark = #{remark},</if>
            <if test="goodsVal != null">goods_val = #{goodsVal},</if>
            <if test="orderType != null">order_type = #{orderType},</if>
+            <if test="returnOrderResult != null">return_order_result = #{returnOrderResult},</if>
        </trim>
        where id = #{id}
    </update>

--- a/qianhe-admin/src/main/resources/mapper/WaterUserAddressMapper.xml
+++ b/qianhe-admin/src/main/resources/mapper/WaterUserAddressMapper.xml
@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
            <if test="phone != null "> and phone = #{phone}</if>
        </where>
+        order by is_default DESC
    </select>
    <select id="selectWaterUserAddressById" parameterType="Long" resultMap="WaterUserAddressResult">

--- a/qianhe-admin/src/main/resources/mapper/WaterUserMapper.xml
+++ b/qianhe-admin/src/main/resources/mapper/WaterUserMapper.xml
@@ -40,9 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        where id = #{id}
    </select>
-    <select id="selectUserByOpenId" parameterType="String" resultMap="WaterUserResult">
+    <select id="selectUserByOpenId" resultMap="WaterUserResult">
        <include refid="selectWaterUserVo"/>
-        where open_id = #{openId} and status != '1'
+        where open_id = #{openId} and user_type = #{userType} and status != '1'
    </select>
    <insert id="insertWaterUser" parameterType="WaterUser" useGeneratedKeys="true" keyProperty="id">
@@ -90,12 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="nickName != null">nick_name = #{nickName},</if>
            <if test="phoneNum != null">phone_num = #{phoneNum},</if>
            <if test="stationName != null">station_name = #{stationName},</if>
-            <if test="userType != null">user_type = #{userType},</if>
            <if test="userGender != null">user_gender = #{userGender},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="status != null">status = #{status},</if>
        </trim>
-        where open_id = #{openId}
+        where open_id = #{openId} and user_type = #{userType}
    </update>
    <update id="deleteWaterUserById" parameterType="Long">

--- a/qianhe-framework/src/main/java/com/qianhe/framework/config/SecurityConfig.java
+++ b/qianhe-framework/src/main/java/com/qianhe/framework/config/SecurityConfig.java
@@ -113,9 +113,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                .antMatchers("/login", "/register", "/captchaImage").permitAll()
                //放行订水小程序登录相关接口
-                .antMatchers("/wx/getWxLoginInfo/**", "/wx/login/**", "/wx/getPhoneNumber/**", "/wx/getUserInfo","/wx/updateUser").permitAll()
+                .antMatchers("/wx/getWxLoginInfo/**", "/wx/login/**", "/wx/getPhoneNumber/**","/wx/updateUser").permitAll()
                //放行送水小程序登录相关接口
-                .antMatchers("/ssWx/getWxLoginInfo/**", "/ssWx/login/**", "/ssWx/getPhoneNumber/**", "/ssWx/getUserInfo","/ssWx/updateUser").permitAll()
+                .antMatchers("/ssWx/getWxLoginInfo/**", "/ssWx/login/**", "/ssWx/getPhoneNumber/**","/ssWx/updateUser").permitAll()
                //通用接口放行
                .antMatchers("/common/**").permitAll()
                //测试放行所有接口