生成用户账户详情

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysFinanceServiceImpl.java

@@ -76,8 +76,8 @@ public class SysFinanceServiceImpl implements SysFinanceService {
             PageInfo<DistributionOrder> pageInfo = new PageInfo<>(distributionOrderList);
             List<OrderBillVo> orderBillVoList = new ArrayList<>();
             for (DistributionOrder distributionOrder : distributionOrderList) {
-                    String distributionOrderId = distributionOrder.getDistributionOrderId();
-                    DistributorProfit distributorProfit = distributorProfitDao.findById(distributionOrderId);
+                String distributionOrderId = distributionOrder.getDistributionOrderId();
+                DistributorProfit distributorProfit = distributorProfitDao.findById(distributionOrderId);
                 OrderBillVo orderBillVo = new OrderBillVo();
                 SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
                 orderBillVo.setDistributionOrderId(distributionOrderId);

ch-wx-api/src/main/java/com/wwdz/ch/wx/api/WxPayCallbackController.java

@@ -296,9 +296,8 @@ public class WxPayCallbackController {
 
             //用户付款成功后，把分销商利润的记录更新为有效,因为未付款前只是创建了预计利润记录，但并未生效
             distributorProfitDao.updateValidState(distributionOrderId, true);
-            //用户账户明细的状态改为待入账
-            userAccountDetailDao.updateState(distributionOrderId, BillEnum.AccountDetailStateEnum.WAIT_ENTRY.getCode());
-
+         /*   //用户账户明细的状态改为待入账
+            userAccountDetailDao.updateState(distributionOrderId, BillEnum.AccountDetailStateEnum.WAIT_ENTRY.getCode());*/
 
             DistributionOrder distributionOrder = distributionOrderDao.findById(distributionOrderId);
             SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
@@ -344,16 +343,14 @@ public class WxPayCallbackController {
 
             //用户付款成功后，把藏家利润的记录更新为有效,因为未付款前只是创建了预计利润记录，但并未生效
             distributorProfitDao.updateValidState(distributionOrderId, true);
-            //用户账户明细的状态改为待入账
-            userAccountDetailDao.updateState(distributionOrderId, BillEnum.AccountDetailStateEnum.WAIT_ENTRY.getCode());
-
+            /* //用户账户明细的状态改为待入账
+            userAccountDetailDao.update(distributionOrderId, BillEnum.AccountDetailStateEnum.WAIT_ENTRY.getCode());*/
             //用户确认签收，新增分销商利润
             DistributionOrder distributionOrder = distributionOrderDao.findById(distributionOrderId);
             SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
             //更新库存
             supplierItemService.reduceStock(distributionOrder.getItemId(), distributionOrder.getItemNum());
             logger.info(">>>>>>>>>>>> 藏馆订单，微信支付回调通知处理成功，更新订单状态和商品库存 <<<<<<<<<<<<");
-
             //给藏家发信息
             String lastOpenId = sendMsgService.getOpenIdByUserId(distributionOrder.getSellerId());
             if (com.xxdxxs.utils.StringUtils.hasLength(lastOpenId)) {
@@ -366,16 +363,19 @@ public class WxPayCallbackController {
                 distributionOrderNoticeMsg.setCreateTime(distributionOrder.getCreateTime());
                 Result result = sendMsgService.newOrderNoticeMsg(distributionOrderNoticeMsg);
                 if (!result.getSuccess()) {
-                    String url = wxAppletApi.getUrlLink("/pages/saleOrder/index","shopState=2");
+                    String url = wxAppletApi.getUrlLink("/pages/saleOrder/index", "shopState=2");
                     String msg = "您的藏馆收到一个新订单,请前往" + url + "查看";
                     aliSmsSender.sendSms(distributionOrder.getSellerId(), msg);
                 }
             } else {
-                String url = wxAppletApi.getUrlLink("/pages/saleOrder/index","shopState=2");
+                String url = wxAppletApi.getUrlLink("/pages/saleOrder/index", "shopState=2");
                 String msg = "您的藏馆收到一个新订单,请前往" + url + "查看";
                 aliSmsSender.sendSms(distributionOrder.getSellerId(), msg);
             }
-          /*  //创建鉴定单
+            //新增用户账户的明细,调整月度账单
+            DistributorProfit distributorProfit = distributorProfitDao.findById(distributionOrderId);
+            userAccountDetailService.create(distributionOrder, distributorProfit);
+            /*  //创建鉴定单
             identifyOrderService.createIdentifyOrder(distributionOrderId);*/
             return Result.success();
         } catch (Exception e) {