|  | @@ -1115,7 +1115,7 @@ class UserCenter extends Common
 | 
											
												
													
														|  |              $todayStart = $todayNow[0];
 |  |              $todayStart = $todayNow[0];
 | 
											
												
													
														|  |              $todayEnd = $todayNow[1]+1;
 |  |              $todayEnd = $todayNow[1]+1;
 | 
											
												
													
														|  |              $userMoneyLogWhere['user_id'] = $userId;
 |  |              $userMoneyLogWhere['user_id'] = $userId;
 | 
											
												
													
														|  | -            $userMoneyLogWhere['type'] = 15;
 |  | 
 | 
											
												
													
														|  | 
 |  | +            $userMoneyLogWhere['type'] = 103;
 | 
											
												
													
														|  |              $appendWhere['createtime'] = [['egt', $todayStart],['lt', $todayEnd],'and'];
 |  |              $appendWhere['createtime'] = [['egt', $todayStart],['lt', $todayEnd],'and'];
 | 
											
												
													
														|  |              $todayMoney = model('UserMoneyLog')->where($userMoneyLogWhere)->where($appendWhere)->sum('value');
 |  |              $todayMoney = model('UserMoneyLog')->where($userMoneyLogWhere)->where($appendWhere)->sum('value');
 | 
											
												
													
														|  |              $totalMoney = model('UserMoneyLog')->where($userMoneyLogWhere)->sum('value');
 |  |              $totalMoney = model('UserMoneyLog')->where($userMoneyLogWhere)->sum('value');
 | 
											
										
											
												
													
														|  | @@ -1208,12 +1208,12 @@ class UserCenter extends Common
 | 
											
												
													
														|  |      public function rechargeList()
 |  |      public function rechargeList()
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  |          try {
 |  |          try {
 | 
											
												
													
														|  | -            $field = 'id,detail,value,createtime';
 |  | 
 | 
											
												
													
														|  | 
 |  | +            $field = 'id,detail,mode,value,createtime';
 | 
											
												
													
														|  |              $where['user_id'] = $this->auth->id;
 |  |              $where['user_id'] = $this->auth->id;
 | 
											
												
													
														|  |              $result = model('UserJewelLog')->field($field)->where($where)->autopage()->order('createtime desc')->select();
 |  |              $result = model('UserJewelLog')->field($field)->where($where)->autopage()->order('createtime desc')->select();
 | 
											
												
													
														|  |              if (!empty($result)) {
 |  |              if (!empty($result)) {
 | 
											
												
													
														|  |                  foreach ($result as $key => &$value) {
 |  |                  foreach ($result as $key => &$value) {
 | 
											
												
													
														|  | -                    $value['value'] = '+'.$value['value'];
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    $value['value'] = $value['mode'].$value['value'];
 | 
											
												
													
														|  |                      $value['createtime'] = !empty($value['createtime']) ? date('Y-m-d H:i',$value['createtime']) : '';
 |  |                      $value['createtime'] = !empty($value['createtime']) ? date('Y-m-d H:i',$value['createtime']) : '';
 | 
											
												
													
														|  |                  }
 |  |                  }
 | 
											
												
													
														|  |              }
 |  |              }
 |