zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -15,19 +15,15 @@ import com.matrix.system.common.tools.ResponseHeadUtil; import com.matrix.system.constance.Dictionary; import com.matrix.system.constance.SystemConstance; import com.matrix.system.hive.action.util.QueryUtil; import com.matrix.system.hive.bean.*; import com.matrix.system.hive.dao.MoneyCardUseDao; import com.matrix.system.hive.dao.SysOrderDao; import com.matrix.system.hive.dao.SysOrderItemDao; import com.matrix.system.hive.dao.SysShopInfoDao; import com.matrix.core.tools.DateUtil; import com.matrix.system.hive.plugin.util.CollectionUtils; import com.matrix.system.hive.pojo.ShoppingCarItem; import com.matrix.system.hive.pojo.ShoppingCarItemsVo; import com.matrix.system.hive.service.*; import com.matrix.system.shopXcx.mqTask.MQTaskRouting; import com.matrix.system.wechart.templateMsg.UniformMsgParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -285,12 +281,12 @@ public @ResponseBody AjaxResult updateOrderTime(SysOrder sysOrder) { sysOrderDao.updateOrderTime(sysOrder.getOrderTime(), sysOrder.getId()); sysOrderDao.updateOrderTime(sysOrder.getPayTime(), sysOrder.getId()); // 修改业绩时间 // 更新业绩时间 AchieveNew achieveNew = new AchieveNew(); achieveNew.setOrderId(sysOrder.getId()); achieveNew.setDatatime(sysOrder.getOrderTime()); achieveNew.setDatatime(sysOrder.getPayTime()); achieveNewService.modifyAchieveTime(achieveNew); return new AjaxResult(AjaxResult.STATUS_SUCCESS, "修改成功"); } zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java
@@ -37,7 +37,7 @@ public int selectInPageCount(@Param("record") SysOrder sysOrder); public void updateOrderTime(@Param("orderTime") Date orderTime, @Param("id") Long id); public void updateOrderTime(@Param("payTime") Date orderTime, @Param("id") Long id); SysOrder selectVipOrderInfoTotal(@Param("vipId") Long vipId);
@@ -243,10 +243,8 @@ achieveNew.setVipId(pageOrder.getVipId()); achieveNew.setSaleId(pageOrder.getStaffId()); if (pageOrder.getOrderTime() != null) { achieveNew.setDatatime(pageOrder.getOrderTime()); } else if (pageOrder.getOrderTime() != null) { achieveNew.setDatatime(pageOrder.getOrderTime()); if (pageOrder.getPayTime() != null) { achieveNew.setDatatime(pageOrder.getPayTime()); } else { achieveNew.setDatatime(new Date()); } zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -220,7 +220,7 @@ sysOrder.setStaffId(source != null ? source.getStaffId() : user.getSuId()); sysOrder.setCompanyId(source != null ? source.getCompanyId() : user.getCompanyId()); sysOrder.setPayTime(new Date()); if (sysOrder.getId() == null) { //新增订单 sysOrder.setOrderNo(codeService.getOrderCode()); @@ -582,6 +582,7 @@ orderStatus = Dictionary.ORDER_STATU_TK; } // 更新收款状态 sourceOrder.setPayTime(new Date()); sourceOrder.setStatu(orderStatus); sourceOrder.setCardPay(cardPayTotal); sourceOrder.setCashPay(cashPayTotal); zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
@@ -163,6 +163,7 @@ if (achieveNew.getOrderItemId().equals(item.getId())) { achieveNewList.add(achieveNew); } } item.setAchaeveList(achieveNewList); }); zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -90,7 +90,7 @@ <!-- 更新订单时间 --> <update id="updateOrderTime"> UPDATE sys_order set ORDER_TIME = #{orderTime} set pay_time = #{payTime} WHERE id=#{id} </update>
@@ -78,11 +78,15 @@ <th data-field="orderTime" data-formatter="MGrid.getTime" data-sortable="true">下单时间</th> <th data-field="total">订单总价</th> <th data-field="zkTotal">折后价</th> <th data-field="payTime" data-formatter="MGrid.getTime" data-sortable="true">支付时间</th> <th data-field="staffName">下单顾问</th> <th data-field="cashPay">现金支付金额</th> <th data-field="cardPay">卡支付金额</th> <th data-field="arrears">欠款金额</th> <th data-field="statu">订单状态</th> <th data-field="remark">备注</th>
@@ -55,11 +55,11 @@ <div class="form-group"> <label class="col-sm-2 control-label">订单时间</label> <label class="col-sm-2 control-label">收款时间</label> <div class="col-sm-4"> <input autocomplete="off" name="orderTime" type="text" <input autocomplete="off" name="payTime" type="text" class="form-control datetimepicker" th:value="${#dates.format(order.orderTime, 'yyyy-MM-dd hh:mm')}" /> th:value="${#dates.format(order.payTime, 'yyyy-MM-dd hh:mm')}" /> </div> </div> <br> zq-erp/src/main/resources/templates/views/admin/hive/store/outStore-form.html
@@ -233,7 +233,7 @@ <el-table-column label="数量"> <template slot-scope="scope"> <el-form-item :prop="'assembleGoods.'+ scope.$index +'.amount'" :rules="rules.count"> <el-form-item :prop="'assembleGoods.'+ scope.$index +'.amount'" > <el-input v-model.number="scope.row.amount"></el-input> </el-form-item> </template> @@ -279,10 +279,6 @@ ], warehouseData : [ { required: true, message: '请选择仓库', trigger: 'change' } ], count : [ { required: true, message: '请输入信息', trigger: 'blur' }, { type : 'number', message: '请输入数字', trigger: 'blur' } ], }, outStoreTypeData : [],
