修改数据库

935090232@qq.com

2021-03-05 b4da2725da57633daff22eed89f09d6e33f18560

 zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java

@@ -56,6 +56,11 @@
public class OrderController extends BaseController {
    @Resource
    private SysOrderService orderService;
    @Autowired
    ShoppingGoodsDao shoppingGoodsDao;

    @Autowired
    private CodeService codeService;

    @Autowired
    private SysOrderItemDao orderItemDao;
@@ -125,6 +130,7 @@
    AjaxResult payOrder(@RequestBody SysOrder sysOrder) {
        SysUsers user = getMe();
        sysOrder.setShopId(user.getShopId());
        sysOrder.setOrderType(SysOrder.ORDER_TYPE_SEAL);
        //校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
        sysOrder = orderService.checkAndSaveOrder(sysOrder);
        orderService.updateReceiptMoney(sysOrder);
@@ -159,17 +165,30 @@
                }
            }
        }



        SysUsers user = getMe();
        sysOrder.setStaffId(user.getSuId());
        sysOrder.setCompanyId(user.getCompanyId());
        sysOrder.setShopId(user.getShopId());
        sysOrder.setStatu(Dictionary.ORDER_STATU_TK);
        sysOrder.setOrderTime(new Date());
        sysOrder.setOrderNo(codeService.getRefundOrderNo());
        //新增订单
        sysOrderDao.insert(sysOrder);
        //插入明细
        for (SysOrderItem item : sysOrder.getItems()) {
            SysOrderItem oldItem=orderItemDao.selectById(item.getId());
            item.setType(oldItem.getType());
            // 取负数
            item.setStatus(Dictionary.ORDER_STATU_TK);
            item.setCount(-item.getCount());
            item.setOrderId(sysOrder.getId());
            item.setId(null);
            orderItemDao.insert(item);
        }


        //校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
        sysOrder = orderService.checkAndSaveOrder(sysOrder);


        orderService.refundOrderMoney(sysOrder);
        //处理用户购买的产品
        return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单退款成功");