补充接口

src/main/java/org/springblade/modules/api/controller/ApiMerchantUserController.java

@@ -17,6 +17,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DigestUtil;
 import org.springblade.core.tool.utils.WebUtil;
 import org.springblade.modules.api.request.AddChildAccountRequest;
+import org.springblade.modules.api.request.AlertChildAccountRequest;
 import org.springblade.modules.api.vo.MerchantIncomeVO;
 import org.springblade.modules.auth.enums.UserEnum;
 import org.springblade.modules.auth.utils.TokenUtil;
@@ -103,6 +104,19 @@ public class ApiMerchantUserController {
         return R.success("添加成功");
     }
 
+    @Transactional
+    @PostMapping("/updateChildAccount")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "修改子账号", notes = "alertChildAccountRequest")
+    public R<Void> deleteChildAccount(@Valid @RequestBody AlertChildAccountRequest request) {
+        UserMerchantVO userMerchant = iUserMerchantService.getByUserId(request.getId());
+        userMerchant.setParentId(AuthUtil.getUserId());
+        userMerchant.setAuditStatus(AuditStatusEnum.PASS.getValue());
+        userMerchant.setAuthShop(request.getAuthShopIds());
+        iUserMerchantService.updateById(userMerchant);
+        return R.success("修改成功");
+    }
+
     @Transactional
     @PostMapping("/deleteChildAccount")
     @ApiOperationSupport(order = 3)

src/main/java/org/springblade/modules/api/request/AlertChildAccountRequest.java

@@ -0,0 +1,37 @@
+package org.springblade.modules.api.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class AlertChildAccountRequest {
+    @NotBlank(message = "子账号Id")
+    @ApiModelProperty(value = "子账号Id")
+    private Long id;
+    @NotBlank(message = "手机号不能为空")
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+    @ApiModelProperty(value = "昵称")
+    private String nickname;
+    @ApiModelProperty(value = "姓名")
+    private String realName;
+    @ApiModelProperty(value = "头像")
+    private String cover;
+    @ApiModelProperty(value = "密码")
+    private String password;
+    @ApiModelProperty(value = "确认密码")
+    private String rePassword;
+    @NotBlank(message = "授权门店不能为空")
+    @ApiModelProperty(value = "授权门店id集合，以逗号分隔")
+    private String authShopIds;
+
+    public String getPassword() {
+        return password == null ? "123456" : password;
+    }
+
+    public String getRePassword() {
+        return rePassword == null ? "123456" : rePassword;
+    }
+}

src/main/java/org/springblade/modules/business/entity/Shop.java

@@ -52,13 +52,13 @@ public class Shop extends BaseEntity {
 	* 经度
 	*/
 	@NotNull(message = "经度不能为空")
-	@ApiModelProperty(value = "经度")
+//	@ApiModelProperty(value = "经度")
 	private Double longitude;
 	/**
 	* 纬度
 	*/
 	@NotNull(message = "纬度不能为空")
-	@ApiModelProperty(value = "纬度")
+//	@ApiModelProperty(value = "纬度")
 	private Double latitude;
 	/**
 	* 所属商家id

src/main/java/org/springblade/modules/finance/entity/OrderGoods.java

@@ -1,5 +1,6 @@
 package org.springblade.modules.finance.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,6 +30,12 @@ public class OrderGoods extends BaseEntity {
 	*/
 	@ApiModelProperty(value = "订单id")
 	private Long orderId;
+	/**
+	 * 订单id
+	 */
+	@ApiModelProperty(value = "订单编号")
+	@TableField(exist = false)
+	private String orderNo;
 	/**
 	* 商品id
 	*/

src/main/java/org/springblade/modules/finance/mapper/OrderGoodsMapper.java

@@ -49,6 +49,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 	 */
     List<OrderGoodsVO> selectUserOrder(IPage<OrderGoodsVO> page, @Param("p") OrderGoodsVO orderGoods);
 
-    List<MerchantPageOrderVO> getMerchantOrder(IPage page, @Param("param") MerchantPageOrderVO merchantPageOrderVO);
+    List<MerchantPageOrderVO> getMerchantOrder(IPage<MerchantPageOrderVO> page, @Param("param") MerchantPageOrderVO merchantPageOrderVO);
 
 }

src/main/java/org/springblade/modules/finance/mapper/OrderGoodsMapper.xml

@@ -40,6 +40,7 @@
     <select id="selectUserOrder" resultType="org.springblade.modules.finance.vo.OrderGoodsVO">
         SELECT
             og.*,
+            o.order_no,
             o.order_state,
             o.is_aftersales
         FROM