钱包+类目

ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java

@@ -6,6 +6,7 @@ import com.ghy.common.core.domain.AjaxResult;
 import com.ghy.common.core.domain.Ztree;
 import com.ghy.common.core.text.Convert;
 import com.ghy.common.enums.BusinessType;
+import com.ghy.common.utils.ExceptionUtil;
 import com.ghy.common.utils.ShiroUtils;
 import com.ghy.goods.domain.DeptGoodsCategory;
 import com.ghy.goods.service.DeptGoodsCategoryService;
@@ -49,6 +50,18 @@ public class GoodsDeptCategoryController extends BaseController {
         return deptGoodsCategoryService.batchAdd(parentId, categoryIds);
     }
 
+    @PostMapping("/listByStep")
+    @ResponseBody
+    public AjaxResult listByStep(DeptGoodsCategory deptGoodsCategory) {
+        try {
+            return AjaxResult.success(deptGoodsCategoryService.listByStep(deptGoodsCategory));
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            return AjaxResult.error(ExceptionUtil.getExceptionMessage(e));
+        }
+
+    }
+
     @RequiresPermissions("goods:deptcategory:edit")
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mmap) {

ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java

@@ -64,7 +64,7 @@ public class WxPayController extends BaseController {
         try {
             // TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description
             PayParam payParam = new PayParam(orderMaster.getCode(),
-                    "orderMaster.get支付金额", "orderMaster.getTittle()", "orderMaster.get商品描述信息");
+                    "0.01", "工圈子测试", "工圈子测试描述");
             map = adapayService.wxLitePay(payParam, payCallback, expend, null, null);
         } catch (BaseAdaPayException e) {
             logger.error("获取微信用户信息失败", e);

ghy-custom/src/main/java/com/ghy/customer/domain/CustomerBank.java

@@ -0,0 +1,32 @@
+package com.ghy.customer.domain;
+
+import com.ghy.common.annotation.Excel;
+import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 消费者银行卡
+ * @author clunt
+ */
+@Data
+public class CustomerBank extends BaseEntity {
+
+    @Excel(name = "消费者银行卡id", cellType = Excel.ColumnType.NUMERIC)
+    private Long customerBankId;
+
+    @Excel(name = "消费者id", cellType = Excel.ColumnType.NUMERIC)
+    private Long customerId;
+
+    @Excel(name = "用户真实姓名", cellType = Excel.ColumnType.STRING)
+    private String name;
+
+    @Excel(name = "银行名称", cellType = Excel.ColumnType.STRING)
+    private String bankName;
+
+    @Excel(name = "银行卡号", cellType = Excel.ColumnType.STRING)
+    private String bankNum;
+
+    @Excel(name = "银行卡绑定手机号", cellType = Excel.ColumnType.STRING)
+    private String phone;
+
+}

ghy-custom/src/main/java/com/ghy/customer/domain/CustomerWallet.java

@@ -0,0 +1,37 @@
+package com.ghy.customer.domain;
+
+import com.ghy.common.annotation.Excel;
+import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 消费者钱包
+ * @author clunt
+ */
+@Data
+public class CustomerWallet extends BaseEntity {
+
+    @Excel(name = "消费者钱包id", cellType = Excel.ColumnType.NUMERIC)
+    private Long customerWalletId;
+
+    @Excel(name = "消费者id", cellType = Excel.ColumnType.NUMERIC)
+    private Long customerId;
+
+    @Excel(name = "消费者总收入", cellType = Excel.ColumnType.STRING)
+    private BigDecimal totalIncome;
+
+    @Excel(name = "消费者总支出", cellType = Excel.ColumnType.STRING)
+    private BigDecimal totalOutcome;
+
+    @Excel(name = "消费者余额", cellType = Excel.ColumnType.STRING)
+    private BigDecimal balance;
+
+    @Excel(name = "消费者冻结余额", cellType = Excel.ColumnType.STRING)
+    private BigDecimal frozenBalance;
+
+    @Excel(name = "钱包状态", cellType = Excel.ColumnType.NUMERIC)
+    private Integer status;
+
+}

ghy-goods/src/main/java/com/ghy/goods/service/DeptGoodsCategoryService.java

@@ -58,6 +58,12 @@ public interface DeptGoodsCategoryService {
      */
     List<DeptGoodsCategory> appList(Long deptId);
 
+    /**
+     * @param deptGoodsCategory 查询条件
+     * @return 父子层级的list
+     */
+    List<DeptGoodsCategory> listByStep(DeptGoodsCategory deptGoodsCategory);
+
     int delete(String ids);
 
     /**

ghy-goods/src/main/java/com/ghy/goods/service/impl/DeptGoodsCategoryServiceImpl.java

@@ -88,6 +88,11 @@ public class DeptGoodsCategoryServiceImpl implements DeptGoodsCategoryService {
         return goodsCategoryList;
     }
 
+    @Override
+    public List<DeptGoodsCategory> listByStep(DeptGoodsCategory deptGoodsCategory) {
+        return deptGoodsCategoryMapper.appList(deptGoodsCategory);
+    }
+
     @Override
     public int delete(String ids) {
         Long[] array = Convert.toLongArray(ids);