diff --git a/admin-pc/src/views/commonMoney/CommonMoneyList.vue b/admin-pc/src/views/commonMoney/CommonMoneyList.vue index c1e609f..1e9dfe6 100644 --- a/admin-pc/src/views/commonMoney/CommonMoneyList.vue +++ b/admin-pc/src/views/commonMoney/CommonMoneyList.vue @@ -158,11 +158,11 @@ align:"center", dataIndex: 'status_dictText' }, - { - title:'领取状态', - align:"center", - dataIndex: 'state_dictText' - }, + // { + // title:'领取状态', + // align:"center", + // dataIndex: 'state_dictText' + // }, { title:'提现金额', align:"center", @@ -173,6 +173,21 @@ align:"center", dataIndex: 'oldMoney' }, + { + title:'姓名', + align:"center", + dataIndex: 'name' + }, + { + title:'银行卡号', + align:"center", + dataIndex: 'cardNumber' + }, + { + title:'开户行', + align:"center", + dataIndex: 'openingBank' + }, { title: '操作', dataIndex: 'action', diff --git a/admin-pc/src/views/modules/order/CommonOrderList.vue b/admin-pc/src/views/modules/order/CommonOrderList.vue new file mode 100644 index 0000000..bd3f24c --- /dev/null +++ b/admin-pc/src/views/modules/order/CommonOrderList.vue @@ -0,0 +1,465 @@ + + + + \ No newline at end of file diff --git a/admin-pc/src/views/modules/order/modules/CommonOrderModal.vue b/admin-pc/src/views/modules/order/modules/CommonOrderModal.vue new file mode 100644 index 0000000..06db082 --- /dev/null +++ b/admin-pc/src/views/modules/order/modules/CommonOrderModal.vue @@ -0,0 +1,196 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java index 5b52e29..e49c7b4 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java @@ -306,6 +306,7 @@ public class AppletIndexServiceImpl implements AppletIndexService { } if (commonOrder.getStatus().equals("0")){ commonOrder.setStatus("1"); + commonOrder.setPayType("0"); commonOrderService.updateById(commonOrder); HanHaiMember hanHaiMember1 = hanHaiMemberService.getById(hanHaiMember.getId()); hanHaiMember1.setMoney(hanHaiMember1.getMoney().subtract(commonOrder.getPrice())); @@ -320,7 +321,6 @@ public class AppletIndexServiceImpl implements AppletIndexService { commonMoneyLog.setState(0); commonMoneyLogService.save(commonMoneyLog); return Result.OK("支付成功"); - } }else { log.info("开始处理订单，订单ID: {}", orderId); @@ -341,6 +341,7 @@ public class AppletIndexServiceImpl implements AppletIndexService { CommonOrder newOrder = new CommonOrder(); BeanUtils.copyProperties(originalOrder, newOrder); newOrder.setId(newOrderId); + newOrder.setPayType("1"); // newOrder.setPid(newOrderId); // 确保新订单的pid指向自己 log.info("创建的新订单: {}", newOrder); diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java index ab1c305..678457a 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java @@ -75,6 +75,8 @@ public class AppletOrderServiceImpl implements AppletOrderService { .orderByDesc(CommonOrder::getCreateTime) .page(page); } + + //循环得到订单信息 List records = page1.getRecords(); for (CommonOrder commonOrder : records) { @@ -82,10 +84,6 @@ public class AppletOrderServiceImpl implements AppletOrderService { } - - - - return Result.OK("订单信息查询成功",page1); } @@ -196,6 +194,7 @@ public class AppletOrderServiceImpl implements AppletOrderService { if (commonOrder.getStatus().equals("0")){ commonOrder.setTitle("微信支付订单"); commonOrder.setStatus("1"); + commonOrder.setPayType("1"); commonOrderService.updateById(commonOrder); //查询用户信息 HanHaiMember member = hanHaiMemberService.getById(commonOrder.getUserId()); @@ -397,6 +396,7 @@ public class AppletOrderServiceImpl implements AppletOrderService { cityOrder.setTwoMoney(totalTwoMoney); cityOrder.setPid("0"); cityOrder.setHasChild("1"); + cityOrder.setPayType("" + payType);//支付方式 // cityOrder.setShopState(2); diff --git a/module-common/src/main/java/org/jeecg/api/wxUtils/order/WxOrderLogisticsUtil.java b/module-common/src/main/java/org/jeecg/api/wxUtils/order/WxOrderLogisticsUtil.java new file mode 100644 index 0000000..1b0a951 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/wxUtils/order/WxOrderLogisticsUtil.java @@ -0,0 +1,84 @@ +package org.jeecg.api.wxUtils.order; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; +import org.jeecg.api.wxUtils.HttpClientUtil; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 微信公众平台订单物流配送工具 + */ +@Component +public class WxOrderLogisticsUtil { + + @Value("${wechat.mpAppId}") + private String appid; + @Value("${wechat.mpAppSecret}") + private String secret;// + @Value("${pay.mchId}") + private String mchId;// + private static String shipmentUrl = "https://api.weixin.qq.com/wxa/sec/order/upload_shipping_info?access_token="; + + + /** + * 订单发货 + * @param out_trade_no 商户系统内部订单号，只能是数字、大小写字母`_-*`且在同一个商户号下唯一 + * @param out_trade_no 商品信息，例如：微信红包抱枕*1个，限120个字以内 + * @param openid 用户标识，用户在小程序appid下的唯一标识 + */ + // logistics_type 物流模式，发货方式枚举值：1、实体物流配送采用快递公司进行实体物流配送形式 2、同城配送 3、虚拟商品，虚拟商品，例如话费充值，点卡等，无实体配送形式 4、用户自提 + public void doShipmentOneself(String out_trade_no, String item_desc, String openid){ + + HashMap map = new HashMap<>(); + + HashMap payer = new HashMap<>(); + payer.put("openid", openid); + + HashMap order_key = new HashMap<>(); + order_key.put("mchid", mchId); + order_key.put("out_trade_no", out_trade_no); + order_key.put("order_number_type", 1); + + ArrayList> shipping_list = new ArrayList<>(); + HashMap shipping_item = new HashMap<>(); + + shipping_item.put("item_desc", item_desc); + + shipping_list.add(shipping_item); + + map.put("payer", payer); + map.put("order_key", order_key); + map.put("logistics_type", 2);//用户自提 + map.put("delivery_mode", 1);//统一发货 + map.put("shipping_list", shipping_list);//商品列表 + + map.put("upload_time", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX").format(new Date()));//上传时间，RFC 3339格式 + + String s = HttpClientUtil.doPostJson(shipmentUrl + getAccessToken(), JSON.toJSONString(map)); + System.out.println("============================================="); + System.out.println(s); + System.out.println("============================================="); + + } + + /** + * 获取令牌 + * + * @return + */ + private String getAccessToken() { + String requestUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret; + String doGet2 = HttpClientUtil.doGet2(requestUrl); + Map map = JSON.parseObject(doGet2, new TypeReference>() { + }); + return map.get("access_token"); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java index 7c675e0..990ddc6 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java @@ -84,6 +84,24 @@ public class CommonMoneyLog implements Serializable { @ApiModelProperty(value = "审核状态") private java.lang.String status; + /**类型*/ + @Excel(name = "姓名", width = 15, dicCode = "withdraw_type") + @Dict(dicCode = "withdraw_type") + @ApiModelProperty(value = "姓名") + private java.lang.String name; + + /**类型*/ + @Excel(name = "开户行", width = 15, dicCode = "withdraw_type") + @Dict(dicCode = "withdraw_type") + @ApiModelProperty(value = "开户行") + private java.lang.String openingBank; + + /**类型*/ + @Excel(name = "银行卡号", width = 15, dicCode = "withdraw_type") + @Dict(dicCode = "withdraw_type") + @ApiModelProperty(value = "银行卡号") + private java.lang.String cardNumber; + /**类型*/ @Excel(name = "提现签名", width = 15) @ApiModelProperty(value = "提现签名") diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java index 3fe41fc..3a12adc 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java @@ -39,14 +39,14 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-05-07 + * @Date: 2025-06-23 * @Version: V1.0 */ @Api(tags="订单信息表") @RestController -@RequestMapping("/commonOrder/commonOrder") +@RequestMapping("/CommonOrder/commonOrder") @Slf4j -public class CommonOrderController extends JeecgController { +public class CommonOrderController extends JeecgController{ @Autowired private ICommonOrderService commonOrderService; @@ -61,16 +61,74 @@ public class CommonOrderController extends JeecgController> queryPageList(CommonOrder commonOrder, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + String hasQuery = req.getParameter("hasQuery"); + if(hasQuery != null && "true".equals(hasQuery)){ + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonOrder, req.getParameterMap()); + List list = commonOrderService.queryTreeListNoPage(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); + }else{ + String parentId = commonOrder.getPid(); + if (oConvertUtils.isEmpty(parentId)) { + parentId = "0"; + } + commonOrder.setPid(null); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonOrder, req.getParameterMap()); + // 使用 eq 防止模糊查询 + queryWrapper.eq("pid", parentId); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonOrderService.page(page, queryWrapper); + return Result.OK(pageList); + } + } + + /** + * 获取子数据 + * @param commonOrder + * @param req + * @return + */ + //@AutoLog(value = "订单信息表-获取子数据") + @ApiOperation(value="订单信息表-获取子数据", notes="订单信息表-获取子数据") + @GetMapping(value = "/childList") + public Result> queryPageList(CommonOrder commonOrder,HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonOrder, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = commonOrderService.page(page, queryWrapper); + List list = commonOrderService.list(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); return Result.OK(pageList); } + + /** + * 批量查询子节点 + * @param parentIds 父ID（多个采用半角逗号分割） + * @return 返回 IPage + * @param parentIds + * @return + */ + //@AutoLog(value = "订单信息表-批量获取子数据") + @ApiOperation(value="订单信息表-批量获取子数据", notes="订单信息表-批量获取子数据") + @GetMapping("/getChildListBatch") + public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List parentIdList = Arrays.asList(parentIds.split(",")); + queryWrapper.in("pid", parentIdList); + List list = commonOrderService.list(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error("批量查询子节点失败：" + e.getMessage()); + } + } /** * 添加 @@ -82,7 +140,7 @@ public class CommonOrderController extends JeecgController add(@RequestBody CommonOrder commonOrder) { - commonOrderService.save(commonOrder); + commonOrderService.addCommonOrder(commonOrder); return Result.OK("添加成功！"); } @@ -96,7 +154,7 @@ public class CommonOrderController extends JeecgController edit(@RequestBody CommonOrder commonOrder) { - commonOrderService.updateById(commonOrder); + commonOrderService.updateCommonOrder(commonOrder); return Result.OK("编辑成功!"); } @@ -110,7 +168,7 @@ public class CommonOrderController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { - commonOrderService.removeById(id); + commonOrderService.deleteCommonOrder(id); return Result.OK("删除成功!"); } @@ -125,7 +183,7 @@ public class CommonOrderController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.commonOrderService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); + return Result.OK("批量删除成功！"); } /** @@ -153,7 +211,7 @@ public class CommonOrderController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, CommonOrder.class); + return super.importExcel(request, response, CommonOrder.class); } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java index e6b985f..8e67061 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java @@ -1,11 +1,8 @@ package org.jeecg.modules.commonOrder.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -17,19 +14,17 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; +import java.io.UnsupportedEncodingException; +import java.util.List; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-05-07 + * @Date: 2025-06-23 * @Version: V1.0 */ @Data @TableName("common_order") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) @ApiModel(value="common_order对象", description="订单信息表") public class CommonOrder implements Serializable { private static final long serialVersionUID = 1L; @@ -37,95 +32,97 @@ public class CommonOrder implements Serializable { /**主键*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") - private java.lang.String id; + private String id; /**创建人*/ @ApiModelProperty(value = "创建人") - private java.lang.String createBy; + private String createBy; /**创建日期*/ @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; + private Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; + private String updateBy; /**更新日期*/ @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; + private Date updateTime; /**订单状态*/ @Excel(name = "订单状态", width = 15, dicCode = "order_state") @Dict(dicCode = "order_state") @ApiModelProperty(value = "订单状态") - private java.lang.String status; + private String status; /**下单用户*/ @Excel(name = "下单用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "下单用户") - private java.lang.String userId; + private String userId; /**订单图片*/ @Excel(name = "订单图片", width = 15) @ApiModelProperty(value = "订单图片") - private java.lang.String image; + private String image; /**订单标题*/ @Excel(name = "订单标题", width = 15) @ApiModelProperty(value = "订单标题") - private java.lang.String title; + private String title; /**客户姓名*/ @Excel(name = "客户姓名", width = 15) @ApiModelProperty(value = "客户姓名") - private java.lang.String name; + private String name; /**联系电话*/ @Excel(name = "联系电话", width = 15) @ApiModelProperty(value = "联系电话") - private java.lang.String phone; + private String phone; /**订单价格*/ @Excel(name = "订单价格", width = 15) @ApiModelProperty(value = "订单价格") - private java.math.BigDecimal price; + private BigDecimal price; /**配送地址*/ @Excel(name = "配送地址", width = 15) @ApiModelProperty(value = "配送地址") - private java.lang.String address; + private String address; /**地址明细*/ @Excel(name = "地址明细", width = 15) @ApiModelProperty(value = "地址明细") - private java.lang.String addressDetail; + private String addressDetail; /**直推佣金*/ @Excel(name = "直推佣金", width = 15) @ApiModelProperty(value = "直推佣金") - private java.math.BigDecimal oneMoney; + private BigDecimal oneMoney; /**间推佣金*/ @Excel(name = "间推佣金", width = 15) @ApiModelProperty(value = "间推佣金") - private java.math.BigDecimal twoMoney; - - + private BigDecimal twoMoney; + /**数量*/ + @Excel(name = "数量", width = 15) + @ApiModelProperty(value = "数量") private Integer num; - /**材料*/ - @Excel(name = "材料", width = 15) - @ApiModelProperty(value = "材料") - private java.lang.String material; - - /**关联商品*/ - @Excel(name = "关联商品", width = 15) - @ApiModelProperty(value = "关联商品") - private java.lang.String shopId; - - /**父级节点*/ - @Excel(name = "父级节点", width = 15) + /**材质*/ + @Excel(name = "材质", width = 15) + @ApiModelProperty(value = "材质") + private String material; + /**父级节点*/ + @Excel(name = "父级节点", width = 15) @ApiModelProperty(value = "父级节点") - private java.lang.String pid; - /**是否有子节点*/ - @Excel(name = "是否有子节点", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") + private String pid; + /**是否有子节点*/ + @Excel(name = "是否有子节点", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") @ApiModelProperty(value = "是否有子节点") - private java.lang.String hasChild; - - /**是否有子节点*/ - @Excel(name = "送货图", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") + private String hasChild; + /**标识*/ + @Excel(name = "标识", width = 15) + @ApiModelProperty(value = "标识") + private String shopId; + /**送货图*/ + @Excel(name = "送货图", width = 15) @ApiModelProperty(value = "送货图") - private java.lang.String deliveryPicture; + private String deliveryPicture; + /**支付方式*/ + @Excel(name = "支付方式", width = 15) + @ApiModelProperty(value = "支付方式 0余额支付 1微信支付") + @Dict(dicCode = "order_pay_type") + private String payType; - @TableField (exist = false) + @TableField(exist = false) private List children; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java index 834135b..bce3e32 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java @@ -1,7 +1,5 @@ package org.jeecg.modules.commonOrder.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Param; import org.jeecg.modules.commonOrder.entity.CommonOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -9,9 +7,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-05-07 + * @Date: 2025-06-23 * @Version: V1.0 */ public interface CommonOrderMapper extends BaseMapper { + /** + * 编辑节点状态 + * @param id + * @param status + */ + void updateTreeNodeStatus(@Param("id") String id,@Param("status") String status); + } diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/xml/CommonOrderMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/xml/CommonOrderMapper.xml index 3fe88fc..bb7d8d0 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/xml/CommonOrderMapper.xml +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/xml/CommonOrderMapper.xml @@ -2,4 +2,8 @@ + + update common_order set has_child = #{status} where id = #{id} + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java index 2cad497..3866f00 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java @@ -2,13 +2,37 @@ package org.jeecg.modules.commonOrder.service; import org.jeecg.modules.commonOrder.entity.CommonOrder; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.exception.JeecgBootException; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.util.List; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-05-07 + * @Date: 2025-06-23 * @Version: V1.0 */ public interface ICommonOrderService extends IService { + /**根节点父ID的值*/ + public static final String ROOT_PID_VALUE = "0"; + + /**树节点有子节点状态值*/ + public static final String HASCHILD = "1"; + + /**树节点无子节点状态值*/ + public static final String NOCHILD = "0"; + + /**新增节点*/ + void addCommonOrder(CommonOrder commonOrder); + + /**修改节点*/ + void updateCommonOrder(CommonOrder commonOrder) throws JeecgBootException; + + /**删除节点*/ + void deleteCommonOrder(String id) throws JeecgBootException; + + /**查询所有数据，无分页*/ + List queryTreeListNoPage(QueryWrapper queryWrapper); + } diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java index 0b32d95..fdd37cb 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java @@ -1,19 +1,215 @@ package org.jeecg.modules.commonOrder.service.impl; +import org.jeecg.api.wxUtils.order.WxOrderLogisticsUtil; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.commonOrder.entity.CommonOrder; import org.jeecg.modules.commonOrder.mapper.CommonOrderMapper; import org.jeecg.modules.commonOrder.service.ICommonOrderService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-05-07 + * @Date: 2025-06-23 * @Version: V1.0 */ @Service public class CommonOrderServiceImpl extends ServiceImpl implements ICommonOrderService { + @Autowired + private WxOrderLogisticsUtil wxOrderLogisticsUtil; + + @Autowired + private IHanHaiMemberService hanHaiMemberService; + + @Override + public void addCommonOrder(CommonOrder commonOrder) { + //新增时设置hasChild为0 + commonOrder.setHasChild(ICommonOrderService.NOCHILD); + if(oConvertUtils.isEmpty(commonOrder.getPid())){ + commonOrder.setPid(ICommonOrderService.ROOT_PID_VALUE); + }else{ + //如果当前节点父ID不为空 则设置父节点的hasChildren 为1 + CommonOrder parent = baseMapper.selectById(commonOrder.getPid()); + if(parent!=null && !"1".equals(parent.getHasChild())){ + parent.setHasChild("1"); + baseMapper.updateById(parent); + } + } + baseMapper.insert(commonOrder); + } + + @Override + public void updateCommonOrder(CommonOrder commonOrder) { + CommonOrder entity = this.getById(commonOrder.getId()); + if(entity==null) { + throw new JeecgBootException("未找到对应实体"); + } + String old_pid = entity.getPid(); + String new_pid = commonOrder.getPid(); + if(!old_pid.equals(new_pid)) { + updateOldParentNode(old_pid); + if(oConvertUtils.isEmpty(new_pid)){ + commonOrder.setPid(ICommonOrderService.ROOT_PID_VALUE); + } + if(!ICommonOrderService.ROOT_PID_VALUE.equals(commonOrder.getPid())) { + baseMapper.updateTreeNodeStatus(commonOrder.getPid(), ICommonOrderService.HASCHILD); + } + } + + + //发货 + if ("1".equals(commonOrder.getStatus())){ + commonOrder.setStatus("2"); + if("1".equals(commonOrder.getPayType())){ + HanHaiMember member = hanHaiMemberService.getById(commonOrder.getUserId()); + + + + wxOrderLogisticsUtil.doShipmentOneself(commonOrder.getId(), commonOrder.getTitle(), member.getAppletOpenid()); + } + } + + baseMapper.updateById(commonOrder); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteCommonOrder(String id) throws JeecgBootException { + //查询选中节点下所有子节点一并删除 + id = this.queryTreeChildIds(id); + if(id.indexOf(",")>0) { + StringBuffer sb = new StringBuffer(); + String[] idArr = id.split(","); + for (String idVal : idArr) { + if(idVal != null){ + CommonOrder commonOrder = this.getById(idVal); + String pidVal = commonOrder.getPid(); + //查询此节点上一级是否还有其他子节点 + List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal).notIn("id",Arrays.asList(idArr))); + if((dataList == null || dataList.size()==0) && !Arrays.asList(idArr).contains(pidVal) + && !sb.toString().contains(pidVal)){ + //如果当前节点原本有子节点 现在木有了，更新状态 + sb.append(pidVal).append(","); + } + } + } + //批量删除节点 + baseMapper.deleteBatchIds(Arrays.asList(idArr)); + //修改已无子节点的标识 + String[] pidArr = sb.toString().split(","); + for(String pid : pidArr){ + this.updateOldParentNode(pid); + } + }else{ + CommonOrder commonOrder = this.getById(id); + if(commonOrder==null) { + throw new JeecgBootException("未找到对应实体"); + } + updateOldParentNode(commonOrder.getPid()); + baseMapper.deleteById(id); + } + } + + @Override + public List queryTreeListNoPage(QueryWrapper queryWrapper) { + List dataList = baseMapper.selectList(queryWrapper); + List mapList = new ArrayList<>(); + for(CommonOrder data : dataList){ + String pidVal = data.getPid(); + //递归查询子节点的根节点 + if(pidVal != null && !"0".equals(pidVal)){ + CommonOrder rootVal = this.getTreeRoot(pidVal); + if(rootVal != null && !mapList.contains(rootVal)){ + mapList.add(rootVal); + } + }else{ + if(!mapList.contains(data)){ + mapList.add(data); + } + } + } + return mapList; + } + + /** + * 根据所传pid查询旧的父级节点的子节点并修改相应状态值 + * @param pid + */ + private void updateOldParentNode(String pid) { + if(!ICommonOrderService.ROOT_PID_VALUE.equals(pid)) { + Long count = baseMapper.selectCount(new QueryWrapper().eq("pid", pid)); + if(count==null || count<=1) { + baseMapper.updateTreeNodeStatus(pid, ICommonOrderService.NOCHILD); + } + } + } + + /** + * 递归查询节点的根节点 + * @param pidVal + * @return + */ + private CommonOrder getTreeRoot(String pidVal){ + CommonOrder data = baseMapper.selectById(pidVal); + if(data != null && !"0".equals(data.getPid())){ + return this.getTreeRoot(data.getPid()); + }else{ + return data; + } + } + + /** + * 根据id查询所有子节点id + * @param ids + * @return + */ + private String queryTreeChildIds(String ids) { + //获取id数组 + String[] idArr = ids.split(","); + StringBuffer sb = new StringBuffer(); + for (String pidVal : idArr) { + if(pidVal != null){ + if(!sb.toString().contains(pidVal)){ + if(sb.toString().length() > 0){ + sb.append(","); + } + sb.append(pidVal); + this.getTreeChildIds(pidVal,sb); + } + } + } + return sb.toString(); + } + + /** + * 递归查询所有子节点 + * @param pidVal + * @param sb + * @return + */ + private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){ + List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal)); + if(dataList != null && dataList.size()>0){ + for(CommonOrder tree : dataList) { + if(!sb.toString().contains(tree.getId())){ + sb.append(",").append(tree.getId()); + } + this.getTreeChildIds(tree.getId(),sb); + } + } + return sb; + } + } diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue index b4b8164..a31ef27 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue @@ -56,20 +56,18 @@ + :expandedRowKeys="expandedRowKeys" + @change="handleTableChange" + @expand="handleExpand" + v-bind="tableProps"> - \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderModal.Style#Drawer.vue deleted file mode 100644 index fdc5994..0000000 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderModal.Style#Drawer.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderModal.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderModal.vue index 7e27362..38f315b 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderModal.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderModal.vue @@ -3,58 +3,193 @@ :title="title" :width="width" :visible="visible" + :confirmLoading="confirmLoading" switchFullscreen @ok="handleOk" - :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @cancel="handleCancel" cancelText="关闭"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.api.ts b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.api.ts index c2e1525..12950ff 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.api.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.api.ts @@ -1,14 +1,17 @@ -import {defHttp} from '/@/utils/http/axios'; +import {defHttp} from "/@/utils/http/axios"; import {Modal} from 'ant-design-vue'; enum Api { - list = '/commonOrder/commonOrder/list', - save='/commonOrder/commonOrder/add', - edit='/commonOrder/commonOrder/edit', - deleteOne = '/commonOrder/commonOrder/delete', - deleteBatch = '/commonOrder/commonOrder/deleteBatch', - importExcel = '/commonOrder/commonOrder/importExcel', - exportXls = '/commonOrder/commonOrder/exportXls', + list = '/CommonOrder/commonOrder/rootList', + save='/CommonOrder/commonOrder/add', + edit='/CommonOrder/commonOrder/edit', + deleteCommonOrder = '/sys/commonOrder/delete', + deleteBatch = '/CommonOrder/commonOrder/deleteBatch', + importExcel = '/CommonOrder/commonOrder/importExcel', + exportXls = '/CommonOrder/commonOrder/exportXls', + loadTreeData = '/CommonOrder/commonOrder/loadTreeRoot', + getChildList = '/CommonOrder/commonOrder/childList', + getChildListBatch = '/CommonOrder/commonOrder/getChildListBatch', } /** * 导出api @@ -17,6 +20,7 @@ enum Api { export const getExportUrl = Api.exportXls; /** * 导入api + * @param params */ export const getImportUrl = Api.importExcel; /** @@ -25,12 +29,11 @@ export const getImportUrl = Api.importExcel; */ export const list = (params) => defHttp.get({url: Api.list, params}); - /** - * 删除单个 + * 删除 */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { +export const deleteCommonOrder = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteCommonOrder, params}, {joinParamsToUrl: true}).then(() => { handleSuccess(); }); } @@ -38,7 +41,7 @@ export const deleteOne = (params,handleSuccess) => { * 批量删除 * @param params */ -export const batchDelete = (params, handleSuccess) => { +export const batchDeleteCommonOrder = (params, handleSuccess) => { Modal.confirm({ title: '确认删除', content: '是否删除选中数据', @@ -55,7 +58,25 @@ export const batchDelete = (params, handleSuccess) => { * 保存或者更新 * @param params */ -export const saveOrUpdate = (params, isUpdate) => { +export const saveOrUpdateDict = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({url: url, params}); } +/** + * 查询全部树形节点数据 + * @param params + */ +export const loadTreeData = (params) => + defHttp.get({url: Api.loadTreeData,params}); +/** + * 查询子节点数据 + * @param params + */ +export const getChildList = (params) => + defHttp.get({url: Api.getChildList, params}); +/** + * 批量查询子节点数据 + * @param params + */ +export const getChildListBatch = (params) => + defHttp.get({url: Api.getChildListBatch, params},{isTransformResponse:false}); diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts index 821d95b..176fed0 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts @@ -65,6 +65,27 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'twoMoney' }, + { + title: '数量', + align:"center", + dataIndex: 'num' + }, + { + title: '材质', + align:"center", + dataIndex: 'material' + }, + { + title: '标识', + align:"center", + dataIndex: 'shopId' + }, + { + title: '送货图', + align:"center", + dataIndex: 'deliveryPicture', + customRender:render.renderAvatar, + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -76,7 +97,7 @@ export const searchFormSchema: FormSchema[] = [ dictCode:"order_state" }, colProps: {span: 6}, - }, + }, { label: "下单用户", field: "userId", @@ -85,7 +106,7 @@ export const searchFormSchema: FormSchema[] = [ dict:"han_hai_member,nick_name,id" }, colProps: {span: 6}, - }, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -152,4 +173,31 @@ export const formSchema: FormSchema[] = [ field: 'twoMoney', component: 'InputNumber', }, + { + label: '数量', + field: 'num', + component: 'InputNumber', + }, + { + label: '材质', + field: 'material', + component: 'Input', + }, + { + label: '父级节点', + field: 'pid', + component: 'Input', + }, + { + label: '标识', + field: 'shopId', + component: 'Input', + }, + { + label: '送货图', + field: 'deliveryPicture', + component: 'JImageUpload', + componentProps:{ + }, + }, ]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrderList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrderList.vue index e5a3002..45d75df 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrderList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrderList.vue @@ -1,162 +1,272 @@ - \ No newline at end of file + diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/components/CommonOrderModal.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/components/CommonOrderModal.vue index c569877..2ab0490 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/components/CommonOrderModal.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/components/CommonOrderModal.vue @@ -1,58 +1,87 @@ - - - \ No newline at end of file