Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -1170,6 +1170,7 @@ public class PayOrderLogic {
         workerOrder.setConfigId(adminWebsit.getPayWorkerCodeId());
         workerOrder.setPayState(IsYesNoEnum.YES.getKey());
         workerOrder.setPayStateTime(new Date());
+        workerOrder.setPayNum(1);
         workerOrder.setOpenId(currentCompanyWechat.getUser().getMiniOpenId());
 
         if (!StringUtil.isEmpty(workerOrder.getWorkerOrderId())){

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -79,6 +79,7 @@
         <if test="value != null and value !=''">
             and (b.user_name like concat('%',#{value},'%') or a.order_base_id like concat('%',#{value},'%') or b.address like concat('%',#{value},'%'))
         </if>
+        order by a.create_time desc
     </select>
 
 </mapper>